突发事件塞进去

Assets/Prefabs/UI/Item/EventListItem.prefab

@@ -35,8 +35,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: 86.5, y: -12}
-  m_SizeDelta: {x: 154, y: 16}
+  m_AnchoredPosition: {x: 114.39917, y: -12}
+  m_SizeDelta: {x: 209.7983, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6590697948993525649
 CanvasRenderer:
@@ -79,7 +79,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8BA1\u5212\u5B8C\u6210\u65E5\u671F\uFF1A2024/03/16"
+  m_Text: "\u8BA1\u5212\u5B8C\u6210\u65E5\u671F\uFF1A2025-11-05 21:03:03"
 --- !u!1 &499945963704705050
 GameObject:
   m_ObjectHideFlags: 0
@@ -222,7 +222,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7442371478093652122
 RectTransform:
   m_ObjectHideFlags: 0
@@ -302,7 +302,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2336675728194386155
 RectTransform:
   m_ObjectHideFlags: 0
@@ -620,7 +620,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7292191420086370975
 RectTransform:
   m_ObjectHideFlags: 0
@@ -760,8 +760,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: 257.5, y: -12}
-  m_SizeDelta: {x: 154, y: 16}
+  m_AnchoredPosition: {x: 114.4, y: -33.6}
+  m_SizeDelta: {x: 209.8, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8402886999319986304
 CanvasRenderer:
@@ -804,7 +804,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5B9E\u9645\u5B8C\u6210\u65E5\u671F\uFF1A2024/03/16"
+  m_Text: "\u5B9E\u9645\u5B8C\u6210\u65E5\u671F\uFF1A2025-11-05 21:03:03"
 --- !u!1 &8252051226800486078
 GameObject:
   m_ObjectHideFlags: 0
@@ -901,23 +901,17 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-    createBy: 
-    createTime: 
-    updateBy: 
-    updateTime: 
     id: 
-    type: 
-    code: 
+    title: 
+    createTime: 
+    planTime: 
+    completeTime: 
+    memberNames: 
+    exportStatus: 
     content: 
     longitude: 
     latitude: 
-    fileId: 
-    childProjectId: 
-    projectStatus: 
-    projectType: 
-    title: 
-    remark: 
-    transactorName: 
+    creator: 
     creatorName: 
   nameText: {fileID: 0}
   dateText: {fileID: 0}

Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -47177,7 +47177,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1131407422490970219
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/HttpGetData.cs

@@ -271,7 +271,11 @@ public class ProjectExamine
 [Serializable]
 public class B08_event
 {
-    public Project_EventData data;
+    public int waitAccept;
+    public int hasHandle;
+    public int waitHandle;
+    public int total;
+    public List<B08_TaskData> rows;
 }
 
 [Serializable]
@@ -279,9 +283,11 @@ public class Project_EventData
 {
     public int waitAccept;
     public int hasHandle;
-    public string completeRate;
     public int waitHandle;
-    public List<B08_TaskData> list;
+    public string completeRate;
+    
+    public int total;
+    public List<B08_TaskData> rows;
 }
 
 [Serializable]
@@ -293,29 +299,19 @@ public class B08_questionStatis
 [Serializable]
 public class B08_TaskData
 {
-    public string createBy;
-    public string createTime;
-    public string updateBy;
-    public string updateTime;
     public string id;
-    public string type;
-    public string code;
+    public string title;
+    public string createTime;
+    public string planTime;
+    public string completeTime;
+    public string memberNames;
+    public string exportStatus;
+    public int? status;//0待派工、1待整改、2待验收、3已整改
 
     public string content;
     public string longitude;
     public string latitude;
-    public string fileId;
-
-    public string parentProjectId;
-    public string childProjectId;
-    public string projectStatus;
-    public string projectType;
-    public string title;
-    public string remark;
-    public int? status;
 
-    //public int? transactor;
-    public string transactorName;
     public string creator;
     public string creatorName;
     public int? grade;

Assets/Scripts/HttpHelper.cs

@@ -62,6 +62,19 @@ public class HttpHelper : MonoBehaviour
         _Instance = this;
 
         ChangeServerAddress();
+        
+        try
+        {
+            var tokenJson = await B08_API_GetToken();
+            GetToken tokenResult= JsonConvert.DeserializeObject<GetToken>(tokenJson);
+            //Debug.Log("GetToken:" + tokenResult.data.token);
+            token = tokenResult.data.token;
+        }
+        catch (Exception e)
+        {
+            Debug.LogWarning("GetToken不成功,原因:" + e.ToString());
+        }
+
 
         if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2 ||
             GlobalData.pageIndex == PageIndex.Page3)
@@ -133,6 +146,7 @@ public class HttpHelper : MonoBehaviour
 
         if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2)
         {
+            
             GetGCYW_Station().Forget();
         }
 
@@ -2129,14 +2143,18 @@ public class HttpHelper : MonoBehaviour
     public async Cysharp.Threading.Tasks.UniTask<string> GetStatistics(string stationId)
     {
         var result="";
+
+        string startTime = DateTime.Now.AddDays(-7).ToString("yyyy-M-d");
+        string endTime =DateTime.Now.ToString("yyyy-M-d");
+        
         var sendData = new PostStatisticsData
         {
             timeRange = new string[]
             {
-                "2025-11-13", "2025-11-19"
+                $"{startTime}", $"{endTime}"
             },
-            startTime = "2025-11-13 00:00:00",
-            endTime = "2025-11-19 23:59:59",
+            startTime = $"{startTime} 00:00:00",
+            endTime = $"{endTime} 23:59:59",
             ids = stationId
         };
         string tempStr = JsonConvert.SerializeObject(sendData);
@@ -2154,7 +2172,57 @@ public class HttpHelper : MonoBehaviour
     public async UniTask InitGCYWData1(string ids)
     {
         GlobalData.B08_Type = ids;
-        string jsonStr;
+        string TFSJ_cmd =
+            $"http://58.19.230.46:9180/prod-api/project/workOrder/list?pageNum=1&pageSize=999&type=2&stationId={ids}&isAsc=desc";
+        
+        UnityWebRequest TFSJ_www = new UnityWebRequest(TFSJ_cmd, "Get");
+        TFSJ_www.downloadHandler = new DownloadHandlerBuffer();
+        TFSJ_www.SetRequestHeader("Content-Type", "application/json");
+        TFSJ_www.SetRequestHeader("Authorization", "Bearer "+token);
+        await TFSJ_www.SendWebRequest();
+        if (TFSJ_www.result != UnityWebRequest.Result.Success)
+        {
+            Debug.LogWarning($"获取{TFSJ_cmd}数据不成功,原因:返request不成功:" + TFSJ_www.downloadHandler.text);
+        }
+        string TFSJ_result = TFSJ_www.downloadHandler.text;
+        GlobalData.B08Event = JsonConvert.DeserializeObject<B08_event>(TFSJ_result);
+        foreach (var eventItems in GlobalData.B08Event.rows)
+        {
+            if (eventItems.status == null)
+            {
+                GlobalData.B08Event.waitHandle++;
+                continue;
+            }
+            switch (eventItems.status)
+            {
+                case 0:
+                case 1:
+                    GlobalData.B08Event.waitHandle++;
+                    break;
+                case 2:
+                    GlobalData.B08Event.waitAccept++;
+                    break;
+                case 3:
+                    GlobalData.B08Event.hasHandle++;
+                    break;
+            }
+        }
+        Debug.Log(TFSJ_result);
+        Debug.Log("!!!!!!!!!!!!!!!!!!!!");
+
+        string XJRW_cmd = $"http://58.19.230.46:9180/prod-api/project/workOrder/list?pageNum=1&pageSize=999&type=3&stationId={ids}&isAsc=desc";
+        UnityWebRequest XJRW_www = new UnityWebRequest(XJRW_cmd, "Get");
+        XJRW_www.downloadHandler = new DownloadHandlerBuffer();
+        XJRW_www.SetRequestHeader("Content-Type", "application/json");
+        XJRW_www.SetRequestHeader("Authorization", "Bearer "+token);
+        await XJRW_www.SendWebRequest();
+        if (XJRW_www.result != UnityWebRequest.Result.Success)
+        {
+            Debug.LogWarning($"获取{XJRW_cmd}数据不成功,原因:返request不成功:" + XJRW_www.downloadHandler.text);
+        }
+        string XJRW_result = XJRW_www.downloadHandler.text;
+        Debug.Log(XJRW_result);
+        Debug.Log("!!!!!!!!!!!!!!!!!!!!");
         // try
         // {
         //     jsonStr = await B08_API_data(ServerAddress.API_B08_dataStatis, type);
@@ -2214,18 +2282,7 @@ public class HttpHelper : MonoBehaviour
     public async Task B08_GetTaskList()
     {
         string jsonStr;
-         try
-        {
-            jsonStr = await B08_API_GetToken();
-            GetToken tokenResult= JsonConvert.DeserializeObject<GetToken>(jsonStr);
-            //Debug.Log("GetToken:" + tokenResult.data.token);
-            token = tokenResult.data.token;
-        }
-        catch (Exception e)
-        {
-            Debug.LogWarning("GetToken不成功,原因:" + e.ToString());
-        }
-
+     
         try
         {
             jsonStr = await B08_API_TaskInfoList(1,999);

Assets/Scripts/UI/Item/B08_EventListItem.cs

@@ -41,21 +41,16 @@ public class B08_EventListItem : MonoBehaviour
 
 
         nameText.text = data.title;
-        dateText.text = data.updateTime;
-        managerText.text = data.transactorName;
-        if (data.projectStatus==null||data.projectStatus.Equals(""))
-        {
-            stateText.text = "<color=#EF491C>未知</color>";
-        }
-        else
-        {
-            stateText.text = data.projectStatus;
-        }
+        dateText.text = data.createTime;
+        managerText.text = data.memberNames;
+        stateText.text = data.exportStatus is null or "" ? "<color=#EF491C>未知</color>" : data.exportStatus;
 
-        PlaneDateText.text = $"计划完成日期：2024/03/16";
-        CompleteDateText.text = $"实际完成日期：2024/03/16";
-        UseTimeText.text = $"已用时间：0天02:12:67";
-        LocalText.text = $"所属部门：安全部";
+        PlaneDateText.text = $"计划完成日期：{data.planTime}";
+        CompleteDateText.text = $"实际完成日期：{data.completeTime}";
+        UseTimeText.text = $"";
+        LocalText.text = $"";
+        // UseTimeText.text = $"已用时间：0天02:12:67";
+        // LocalText.text = $"所属部门：安全部";
         
         more.SetActive(false);
         

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

@@ -124,11 +124,12 @@ public class GCYWLayer : YZTRootLayer
             {
                 await HttpHelper._Instance.InitGCYWData1(currentIds);
             }
-            //
+            SetTFSJ_Data();
+            
+            //todo 其他信息获取
             // SetShuJuTongJiData();
             // SetXunJianBarChart();
             // SetGongChengGuanLiChart();
-            // SetTFSJ_Data();
             //
             // await HttpHelper._Instance.B08_GetTaskList();
             // taskListPanel.SetData(this);
@@ -139,7 +140,7 @@ public class GCYWLayer : YZTRootLayer
         }
     }
 
-    private async void OnEnable()
+    private void OnEnable()
     {
         stationNames.Clear();
         ids.Clear();
@@ -194,11 +195,11 @@ public class GCYWLayer : YZTRootLayer
     public void SetTFSJ_Data()
     {
         B08_event tempData = GlobalData.B08Event;
-        TFSJ_DaiChuLiNumTex.text = tempData.data.waitHandle.ToString();
-        TFSJ_DaiYanShouNumTex.text = tempData.data.waitAccept.ToString();
-        TFSJ_YiChuLiNumTex.text = tempData.data.hasHandle.ToString();
-        TFSJ_completeText.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
-        TFSJ_completeSlider.fillAmount = float.Parse(tempData.data.completeRate);
+        TFSJ_DaiChuLiNumTex.text = tempData.waitHandle.ToString();
+        TFSJ_DaiYanShouNumTex.text = tempData.waitAccept.ToString();
+        TFSJ_YiChuLiNumTex.text = tempData.hasHandle.ToString();
+        TFSJ_completeText.text = $"{tempData.hasHandle*1.0f/tempData.total * 100.0f:0}%";
+        TFSJ_completeSlider.fillAmount = tempData.hasHandle*1.0f/tempData.total;
 
         for (int i = 0; i < TFSJ_eventItems.Count; i++)
         {
@@ -206,10 +207,10 @@ public class GCYWLayer : YZTRootLayer
         }
 
         TFSJ_eventItems.Clear();
-        for (int i = 0; i < tempData.data.list.Count; i++)
+        for (int i = 0; i < tempData.rows.Count; i++)
         {
             var tempObj = Instantiate(eventListItemPrefab, TFSJ_eventItemContent).GetComponent<B08_EventListItem>();
-            tempObj.Init(tempData.data.list[i]);
+            tempObj.Init(tempData.rows[i]);
             TFSJ_eventItems.Add(tempObj.gameObject);
         }