接两个饼状图数据

Assets/Scripts/HttpGetData.cs

@@ -471,6 +471,35 @@ public class B08_TaskLocation
     public string createBy;
 }
 
+[Serializable]
+public class B08_Char_1
+{
+    public B08_Char_1_Info[] data;
+}
+
+[Serializable]
+public class B08_Char_1_Info
+{
+    public string name;
+    public string type;
+    public int count;
+}
+
+[Serializable]
+public class B08_Char_2
+{
+    public B08_Char_2_Info data;
+}
+
+[Serializable]
+public class B08_Char_2_Info
+{
+    public int grade1;
+    public int grade2;
+    public int grade3;
+    public int grade4;
+}
+
 
 // [Serializable]
 // public class B08_TaskItemFiles

Assets/Scripts/HttpHelper.cs

@@ -148,6 +148,7 @@ public class HttpHelper : MonoBehaviour
         {
             
             GetGCYW_Station().Forget();
+            B08_ChartInfo().Forget();
         }
 
         if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2 ||
@@ -2336,6 +2337,46 @@ public class HttpHelper : MonoBehaviour
         return result;
     }
     
+    public async UniTaskVoid B08_ChartInfo()
+    {
+        string cmdUrl = "http://58.19.230.46:9180/prod-api/project/workOrder/eventProjectTypeCount";
+        Debug.Log("!!!:" + cmdUrl +" token:"+token);
+        UnityWebRequest www = new UnityWebRequest(cmdUrl, "Get");
+        www.downloadHandler = new DownloadHandlerBuffer();
+        www.SetRequestHeader("Content-Type", "application/json");
+        www.SetRequestHeader("Authorization", "Bearer "+token);
+        await www.SendWebRequest();
+        if (www.result != UnityWebRequest.Result.Success)
+        {
+            Debug.LogWarning("获取B08_ChartInfo_1 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+        }
+        else
+        {
+            Debug.Log("B08_Char_1:" + www.downloadHandler.text);
+            GlobalData.B08Char1 = JsonConvert.DeserializeObject<B08_Char_1>(www.downloadHandler.text);
+        }
+        www.Dispose();
+
+        cmdUrl = "http://58.19.230.46:9180/prod-api/project/workOrder/eventGradeCount";
+        Debug.Log("!!!:" + cmdUrl +" token:"+token);
+        www = new UnityWebRequest(cmdUrl, "Get");
+        www.downloadHandler = new DownloadHandlerBuffer();
+        www.SetRequestHeader("Content-Type", "application/json");
+        www.SetRequestHeader("Authorization", "Bearer "+token);
+        await www.SendWebRequest();
+        if (www.result != UnityWebRequest.Result.Success)
+        {
+            Debug.LogWarning("获取B08_ChartInfo_2 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+        }
+        else
+        {
+            Debug.Log("B08_Char_2:" + www.downloadHandler.text);
+            GlobalData.B08Char2 = JsonConvert.DeserializeObject<B08_Char_2>(www.downloadHandler.text);
+        }
+        www.Dispose();
+    }
+    
+    
     /// <summary>
     /// 获取站点水位图表
     /// </summary>

Assets/Scripts/UI/Data/GlobalData.cs

@@ -168,6 +168,10 @@ public class GlobalData
 
     public static Dictionary<string,string> B08StationList=new Dictionary<string, string>();
     public static Dictionary<string,B08_StatisticsInfo> B08StatisticsInfo=new Dictionary<string, B08_StatisticsInfo>();
+
+
+    public static B08_Char_1 B08Char1;
+    public static B08_Char_2 B08Char2;
     
     #endregion   
     

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

@@ -140,14 +140,7 @@ public class GCYWLayer : YZTRootLayer
                 await HttpHelper._Instance.InitGCYWData1(currentIds);
             }
             SetTFSJ_Data();
-            
-            //todo 其他信息获取
-            // SetShuJuTongJiData();
-            // SetXunJianBarChart();
-            // SetGongChengGuanLiChart();
-            //
-            // await HttpHelper._Instance.B08_GetTaskList();
-             taskListPanel.SetData(this);
+            taskListPanel.SetData(this);
         }
         catch (Exception e)
         {
@@ -166,45 +159,72 @@ public class GCYWLayer : YZTRootLayer
         stationDropdown.AddOptions(stationNames);
         stationDropdown.onValueChanged.AddListener(ChangeData);
         stationDropdown.value = 0;
+        
+        SetChart();
         ChangeData(0);
         cameraBird = CameraManager.instance.mainCamera.GetComponent<CameraBird>();
+        
     }
 
-    public void SetGongChengGuanLiChart()
+    public void SetChart()
     {
-        B08_projectExamine tempData = GlobalData.B08ProjectExamine;
-
-        var tempSeries = gongChengGuanLiChart.series;
-        int tempCount = 0;
-        SerieData[] tempDatas = new SerieData[tempData.data.type1.Length];
-        for (int i = 0; i < tempDatas.Length; i++)
+        if (GlobalData.B08Char1 != null)
         {
-            tempDatas[i] = new SerieData();
-            tempDatas[i].data = new List<double>();
-            tempDatas[i].data.Add(i);
-            tempDatas[i].data.Add(tempData.data.type1[i].value);
-            tempDatas[i].name = tempData.data.type1[i].key;
-            tempCount += tempData.data.type1[i].value;
+            var tempData = GlobalData.B08Char1;
+            var tempSeries = gongChengGuanLiChart.series;
+            int tempCount = 0;
+            SerieData[] tempDatas = new SerieData[tempData.data.Length];
+            for (int i = 0; i < tempDatas.Length; i++)
+            {
+                tempDatas[i] = new SerieData();
+                tempDatas[i].data = new List<double>();
+                tempDatas[i].data.Add(i);
+                tempDatas[i].data.Add(tempData.data[i].count);
+                tempDatas[i].name = tempData.data[i].name;
+                tempCount += tempData.data[i].count;
+            }
+            tempSeries[0].data.Clear();
+            tempSeries[0].data.AddRange(tempDatas);
+            gongChengGuanLiChartCount.text = tempCount.ToString(); 
+            
+            gongChengGuanLiChart.RefreshChart();
         }
 
-        tempSeries[0].data.Clear();
-        tempSeries[0].data.AddRange(tempDatas);
-
-        gongChengGuanLiChartCount.text = tempCount.ToString();
-
-        var tempSeries_1 = fenJiKaoPingChart.series;
-        SerieData[] tempDatas_1 = new SerieData[tempData.data.type2.Length];
-        for (int i = 0; i < tempDatas_1.Length; i++)
+        if (GlobalData.B08Char2 != null)
         {
-            tempDatas_1[i] = new SerieData();
-            tempDatas_1[i].data = new List<double>();
-            tempDatas_1[i].data.Add(i);
-            tempDatas_1[i].data.Add(tempData.data.type2[i].value);
-            tempDatas_1[i].name = tempData.data.type2[i].key;
+            var tempdata_1 = GlobalData.B08Char2;
+            var tempSeries_1 = fenJiKaoPingChart.series;
+            SerieData[] tempDatas_1 = new SerieData[4];
+            for (int i = 0; i < tempDatas_1.Length; i++)
+            {
+                tempDatas_1[i] = new SerieData();
+                tempDatas_1[i].data = new List<double>();
+                tempDatas_1[i].data.Add(i);
+                switch (i)
+                {
+                    case 0:
+                        tempDatas_1[i].data.Add(tempdata_1.data.grade1);
+                        tempDatas_1[i].name = "低";
+                        break;
+                    case 1:
+                        tempDatas_1[i].data.Add(tempdata_1.data.grade2);
+                        tempDatas_1[i].name = "中";
+                        break;
+                    case 2:
+                        tempDatas_1[i].data.Add(tempdata_1.data.grade3);
+                        tempDatas_1[i].name = "高";
+                        break;
+                    case 3:
+                        tempDatas_1[i].data.Add(tempdata_1.data.grade4);
+                        tempDatas_1[i].name = "紧急";
+                        break;
+                }
+              
+            }
+            tempSeries_1[0].data.Clear();
+            tempSeries_1[0].data.AddRange(tempDatas_1);
+            fenJiKaoPingChart.RefreshChart();
         }
-
-        tempSeries_1[0].data.Clear();
-        tempSeries_1[0].data.AddRange(tempDatas_1);
     }
 
 
@@ -237,44 +257,6 @@ public class GCYWLayer : YZTRootLayer
         // _tuFaShiJian_Slider.fillAmount = float.Parse(tempData.data.completeRate);
     }
 
-    // public void SetWTZG_Data()
-    // {
-    //     B08_questionStatis tempData = GlobalData.B08QuestionStatis;
-    //     WTZG_DaiChuLiNumTex.text = tempData.data.waitHandle.ToString();
-    //     WTZG_DaiYanShouNumTex.text = tempData.data.waitAccept.ToString();
-    //     WTZG_YiChuLiNumTex.text = tempData.data.hasHandle.ToString();
-    //     WTZG_completeText.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
-    //     WTZG_completeSlider.fillAmount = float.Parse(tempData.data.completeRate);
-    //
-    //     for (int i = 0; i < WTZG_eventItems.Count; i++)
-    //     {
-    //         Destroy(WTZG_eventItems[i]);
-    //     }
-    //
-    //     WTZG_eventItems.Clear();
-    //     for (int i = 0; i < tempData.data.list.Count; i++)
-    //     {
-    //         var tempObj = Instantiate(eventListItemPrefab, WTZG_eventItemContent).GetComponent<B08_EventListItem>();
-    //         tempObj.Init(tempData.data.list[i]);
-    //         WTZG_eventItems.Add(tempObj.gameObject);
-    //     }
-    //
-    //     _zhengGaiWenTi_Count_Text.text =
-    //         $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
-    //     _zhengGaiWenTi_Vlaue_Text.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
-    //     _zhengGaiWenTi_Slider.fillAmount = float.Parse(tempData.data.completeRate);
-    // }
-
-    // public void SetXJLE_Data()
-    // {
-    //     B08_inspectType tempData = GlobalData.B08InspectType;
-    //     dianQiCountText.text = tempData.data[0].value.ToString();
-    //     zhaZhanCountText.text = tempData.data[1].value.ToString();
-    //     diFangCountText.text = tempData.data[2].value.ToString();
-    //     jiaoChaJianZhuCountText.text = tempData.data[3].value.ToString();
-    //     dingQiZhuanXiangCountText.text = tempData.data[4].value.ToString();
-    // }
-
 
     public void CheckPathChange()
     {