工程运维一部分内容

Assets/Scripts/HttpHelper.cs

@@ -133,11 +133,7 @@ public class HttpHelper : MonoBehaviour
 
         if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2)
         {
-            
             GetGCYW_Station().Forget();
-            Debug.Log("HttpInitGCYWData1");
-            //可以并行，无需等待
-            InitGCYWData1(0);
         }
 
         if (GlobalData.pageIndex == PageIndex.Page1 || GlobalData.pageIndex == PageIndex.Page2 ||
@@ -2155,59 +2151,53 @@ public class HttpHelper : MonoBehaviour
         return result;
     }
     
-
-    /// <summary>
-    /// 0 补元 1套口
-    /// </summary>
-    /// <param name="type"></param>
-    public async Task InitGCYWData1(int type)
+    public async UniTask InitGCYWData1(string ids)
     {
-        Debug.Log($"获取B08GCYW 数据：{(type == 0 ? "补元" : "套口")}");
-        GlobalData.B08_Type = type;
+        GlobalData.B08_Type = ids;
         string jsonStr;
-        try
-        {
-            jsonStr = await B08_API_data(ServerAddress.API_B08_dataStatis, type);
-            Debug.Log("API_B08_dataStatis" + jsonStr);
-            GlobalData.B08DataStatis = JsonConvert.DeserializeObject<B08_dataStatis>(jsonStr);
-        }
-        catch (Exception e)
-        {
-            Debug.LogWarning("获取API_B08_dataStatis数据不成功,原因:" + e.ToString());
-        }
-
-        try
-        {
-            jsonStr = await B08_API_data(ServerAddress.API_B08_inspectResult, type);
-            Debug.Log("API_B08_inspectResult" + jsonStr);
-            GlobalData.B08InspectResult = JsonConvert.DeserializeObject<B08_inspectResult>(jsonStr);
-        }
-        catch (Exception e)
-        {
-            Debug.LogWarning("获取API_B08_inspectResult数据不成功,原因:" + e.ToString());
-        }
-
-        try
-        {
-            jsonStr = await B08_API_data(ServerAddress.API_B08_projectExamine, type);
-            Debug.Log("API_B08_projectExamine" + jsonStr);
-            GlobalData.B08ProjectExamine = JsonConvert.DeserializeObject<B08_projectExamine>(jsonStr);
-        }
-        catch (Exception e)
-        {
-            Debug.LogWarning("获取API_B08_projectExamine数据不成功,原因:" + e.ToString());
-        }
-
-        try
-        {
-            jsonStr = await B08_API_data(ServerAddress.API_B08_event, type);
-            Debug.Log("API_B08_event" + jsonStr);
-            GlobalData.B08Event = JsonConvert.DeserializeObject<B08_event>(jsonStr);
-        }
-        catch (Exception e)
-        {
-            Debug.LogWarning("获取API_B08_event数据不成功,原因:" + e.ToString());
-        }
+        // try
+        // {
+        //     jsonStr = await B08_API_data(ServerAddress.API_B08_dataStatis, type);
+        //     Debug.Log("API_B08_dataStatis" + jsonStr);
+        //     GlobalData.B08DataStatis = JsonConvert.DeserializeObject<B08_dataStatis>(jsonStr);
+        // }
+        // catch (Exception e)
+        // {
+        //     Debug.LogWarning("获取API_B08_dataStatis数据不成功,原因:" + e.ToString());
+        // }
+        //
+        // try
+        // {
+        //     jsonStr = await B08_API_data(ServerAddress.API_B08_inspectResult, type);
+        //     Debug.Log("API_B08_inspectResult" + jsonStr);
+        //     GlobalData.B08InspectResult = JsonConvert.DeserializeObject<B08_inspectResult>(jsonStr);
+        // }
+        // catch (Exception e)
+        // {
+        //     Debug.LogWarning("获取API_B08_inspectResult数据不成功,原因:" + e.ToString());
+        // }
+        //
+        // try
+        // {
+        //     jsonStr = await B08_API_data(ServerAddress.API_B08_projectExamine, type);
+        //     Debug.Log("API_B08_projectExamine" + jsonStr);
+        //     GlobalData.B08ProjectExamine = JsonConvert.DeserializeObject<B08_projectExamine>(jsonStr);
+        // }
+        // catch (Exception e)
+        // {
+        //     Debug.LogWarning("获取API_B08_projectExamine数据不成功,原因:" + e.ToString());
+        // }
+        //
+        // try
+        // {
+        //     jsonStr = await B08_API_data(ServerAddress.API_B08_event, type);
+        //     Debug.Log("API_B08_event" + jsonStr);
+        //     GlobalData.B08Event = JsonConvert.DeserializeObject<B08_event>(jsonStr);
+        // }
+        // catch (Exception e)
+        // {
+        //     Debug.LogWarning("获取API_B08_event数据不成功,原因:" + e.ToString());
+        // }
 
         // try
         // {

Assets/Scripts/UI/Data/GlobalData.cs

@@ -163,7 +163,7 @@ public class GlobalData
     //public static B08_inspectType B08InspectType;
     public static B08_TaskListInfoData B08TaskListData;
     //public static B08_TaskListInfoData[] B08TaskListInfos;
-    public static int B08_Type = -1;
+    public static string B08_Type = "";
 
     public static Dictionary<string,string> B08StationList=new Dictionary<string, string>();
     public static Dictionary<string,B08_StatisticsInfo> B08StatisticsInfo=new Dictionary<string, B08_StatisticsInfo>();

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using MPUIKIT;
 using Unity.VisualScripting;
 using UnityEngine;
@@ -10,20 +11,13 @@ using XCharts.Runtime;
 
 public class GCYWLayer : YZTRootLayer
 {
-    private Text _xunJianRenWuText;
-    private Text _xunJianRenCiText;
-    private Text _quanBuGongChengText;
-    private Text _dangRiGongChengText;
-    private Text _zhengChangYunXingText;
-
-    // private Text _zhengGaiWenTi_Count_Text;
-    // private Text _zhengGaiWenTi_Vlaue_Text;
-    // private MPImage _zhengGaiWenTi_Slider;
-
-    private Text _tuFaShiJian_Count_Text;
-    private Text _tuFaShiJian_Vlaue_Text;
-    private MPImage _tuFaShiJian_Slider;
-
+    private Dropdown stationDropdown;
+    
+    private Text _daiPaiGongText;
+    private Text _daiXunJianText;
+    private Text _xunJianZhongText;
+    private Text _yiXunJianText;
+    
     private BarChart wenTiTongJiBarChart;
 
 
@@ -37,29 +31,7 @@ public class GCYWLayer : YZTRootLayer
     public GameObject eventListItemPrefab;
     private List<GameObject> TFSJ_eventItems = new List<GameObject>();
     private Transform TFSJ_eventItemContent;
-
-    //问题整改总计
-    // private Text WTZG_DaiChuLiNumTex;
-    // private Text WTZG_DaiYanShouNumTex;
-    // private Text WTZG_YiChuLiNumTex;
-    // private Text WTZG_completeText;
-    // private MPImage WTZG_completeSlider;
-    //
-    // private List<GameObject> WTZG_eventItems = new List<GameObject>();
-    // private Transform WTZG_eventItemContent;
-
-    //巡检类型总计
-    // private Text dianQiCountText;
-    // private Text zhaZhanCountText;
-    // private Text diFangCountText;
-    // private Text jiaoChaJianZhuCountText;
-    // private Text dingQiZhuanXiangCountText;
-    // private Button dianQiButton;
-    // private Button zhaZhanButton;
-    // private Button diFangButton;
-    // private Button jianChaJianZhuButton;
-    // private Button diQiZhuanXiangButton;
-
+    
     //工程管理
     private PieChart gongChengGuanLiChart;
     private PieChart fenJiKaoPingChart;
@@ -70,11 +42,6 @@ public class GCYWLayer : YZTRootLayer
     private Text checkPathButtonText;
     private bool showCheckPath = false;
 
-    private Button BuYuanDataButton;
-    private Button TaoKouDataButton;
-    private CanvasGroup button_CG1;
-    private CanvasGroup button_CG2;
-
     public TaskListPanel taskListPanel;
 
     //public GameObject taskPhotoPanelObj;
@@ -87,6 +54,10 @@ public class GCYWLayer : YZTRootLayer
 
     //public Button closePanelBtn;
 
+    private List<string> stationNames = new List<string>();
+    private List<string> ids = new List<string>();
+    private string currentIds = "";
+
     private void Awake()
     {
         Init();
@@ -94,21 +65,13 @@ public class GCYWLayer : YZTRootLayer
 
     public void Init()
     {
-        _xunJianRenWuText = this.transform.Find("ShuJuTongJi/XunJianRenWu/title/numText").GetComponent<Text>();
-        _xunJianRenCiText = this.transform.Find("ShuJuTongJi/XunJianRenCi/title/numText").GetComponent<Text>();
-        _quanBuGongChengText = this.transform.Find("ShuJuTongJi/QuanBuGongCheng/title/numText").GetComponent<Text>();
-        _dangRiGongChengText = this.transform.Find("ShuJuTongJi/DangRiJingGao/title/numText").GetComponent<Text>();
-        _zhengChangYunXingText =
-            this.transform.Find("ShuJuTongJi/ZhengChangGongCheng/title/numText").GetComponent<Text>();
-
-        // _zhengGaiWenTi_Count_Text = this.transform.Find("ShuJuTongJi/ZhengGaiWenTi/count/numText").GetComponent<Text>();
-        // _zhengGaiWenTi_Vlaue_Text = this.transform.Find("ShuJuTongJi/ZhengGaiWenTi/value/numText").GetComponent<Text>();
-        // _zhengGaiWenTi_Slider = this.transform.Find("ShuJuTongJi/ZhengGaiWenTi/slider").GetComponent<MPImage>();
-
-        _tuFaShiJian_Count_Text = this.transform.Find("ShuJuTongJi/TuFaShiJian/count/numText").GetComponent<Text>();
-        _tuFaShiJian_Vlaue_Text = this.transform.Find("ShuJuTongJi/TuFaShiJian/value/numText").GetComponent<Text>();
-        _tuFaShiJian_Slider = this.transform.Find("ShuJuTongJi/TuFaShiJian/slider").GetComponent<MPImage>();
-
+        stationDropdown = this.transform.Find("ShuJuTongJi/Dropdown").GetComponent<Dropdown>();
+        
+        _daiPaiGongText = this.transform.Find("ShuJuTongJi/DaiPaiGong/title/numText").GetComponent<Text>();
+        _daiXunJianText = this.transform.Find("ShuJuTongJi/DaiXunJian/title/numText").GetComponent<Text>();
+        _xunJianZhongText = this.transform.Find("ShuJuTongJi/XunJianZhong/title/numText").GetComponent<Text>();
+        _yiXunJianText = this.transform.Find("ShuJuTongJi/YiXunJian/title/numText").GetComponent<Text>();
+        
         wenTiTongJiBarChart = this.transform.Find("ShuJuTongJi/XunJianTongJi/BarChart").GetComponent<BarChart>();
 
         gongChengGuanLiChart = this.transform.Find("GongChengGuanLi/GuanLiJianCha").GetComponent<PieChart>();
@@ -122,130 +85,71 @@ public class GCYWLayer : YZTRootLayer
         TFSJ_completeText = this.transform.Find("TuFaShiJian/completeText/numText").GetComponent<Text>();
         TFSJ_completeSlider = this.transform.Find("TuFaShiJian/slider").GetComponent<MPImage>();
         TFSJ_eventItemContent = this.transform.Find("TuFaShiJian/TuFaShiJianTongBao/ScrollView/Viewport/Content");
-
-        // WTZG_DaiChuLiNumTex = this.transform.Find("ZhengGaiWenTi/DaiZhengGai/count").GetComponent<Text>();
-        // WTZG_DaiYanShouNumTex = this.transform.Find("ZhengGaiWenTi/DaiYanShou/count").GetComponent<Text>();
-        // WTZG_YiChuLiNumTex = this.transform.Find("ZhengGaiWenTi/YiZhengGai/count").GetComponent<Text>();
-        // WTZG_completeText = this.transform.Find("ZhengGaiWenTi/completeText/numText").GetComponent<Text>();
-        // WTZG_completeSlider = this.transform.Find("ZhengGaiWenTi/slider").GetComponent<MPImage>();
-        // WTZG_eventItemContent = this.transform.Find("ZhengGaiWenTi/ZhengGaiTongBao/ScrollView/Viewport/Content");
-
-        // dianQiCountText = this.transform.Find("XunJianLeiXingZongJi/DianQi/count").GetComponent<Text>();
-        // zhaZhanCountText = this.transform.Find("XunJianLeiXingZongJi/ZhaZhan/count").GetComponent<Text>();
-        // diFangCountText = this.transform.Find("XunJianLeiXingZongJi/DiFang/count").GetComponent<Text>();
-        // jiaoChaJianZhuCountText = this.transform.Find("XunJianLeiXingZongJi/JiaoChaJianZhu/count").GetComponent<Text>();
-        // dingQiZhuanXiangCountText =
-        //     this.transform.Find("XunJianLeiXingZongJi/DingQiZhuanXiang/count").GetComponent<Text>();
-        // dianQiButton = dianQiCountText.transform.parent.GetComponent<Button>();
-        // zhaZhanButton = zhaZhanCountText.transform.parent.GetComponent<Button>();
-        // diFangButton = diFangCountText.transform.parent.GetComponent<Button>();
-        // jianChaJianZhuButton = jiaoChaJianZhuCountText.transform.parent.GetComponent<Button>();
-        // diQiZhuanXiangButton = dingQiZhuanXiangCountText.transform.parent.GetComponent<Button>();
-        // dianQiButton.onClick.AddListener(() => OpenTaskListPanel(0));
-        // zhaZhanButton.onClick.AddListener(() => OpenTaskListPanel(1));
-        // diFangButton.onClick.AddListener(() => OpenTaskListPanel(2));
-        // jianChaJianZhuButton.onClick.AddListener(() => OpenTaskListPanel(3));
-        // diQiZhuanXiangButton.onClick.AddListener(() => OpenTaskListPanel(4));
-
+        
         checkPathButton = this.transform.Find("CheckPathButton").GetComponent<Button>();
         checkPathButtonText = checkPathButton.GetComponentInChildren<Text>();
         checkPathButton.onClick.AddListener(CheckPathChange);
-
-        TaoKouDataButton = this.transform.Find("TaoKouButton").GetComponent<Button>();
-        button_CG2 = TaoKouDataButton.GetComponent<CanvasGroup>();
-        TaoKouDataButton.onClick.AddListener(() => { ChangeData(1); });
-        BuYuanDataButton = this.transform.Find("BuYuanButton").GetComponent<Button>();
-        button_CG1 = BuYuanDataButton.GetComponent<CanvasGroup>();
-        BuYuanDataButton.onClick.AddListener(() => { ChangeData(0); });
-        
-
-        // closePanelBtn.onClick.AddListener(() =>
-        // {
-        //     taskListPanel.gameObject.SetActive(false);
-        //     taskPointLineRenderer.positionCount = 0;
-        //     for (int i = 0; i < taskPointIcons.Count; i++)
-        //     {
-        //         Destroy(taskPointIcons[i].gameObject);
-        //     }
-        //
-        //     taskPointIcons.Clear();
-        // });
     }
 
     private async void ChangeData(int type)
     {
-        //切换补元、套口数据
-        StaticLod.instance.OnFoucusStatic(type);
-        button_CG1.alpha = type == 0 ? 1.0f : 0.4f;
-        button_CG2.alpha = type == 1 ? 1.0f : 0.4f;
-        showCheckPath = false;
-        string textStr = showCheckPath ? "隐藏" : "显示";
-        checkPathButtonText.text = $"巡检路线({textStr})";
+        try
+        {
+            currentIds = ids[type];
+            
+            showCheckPath = false;
+            string textStr = showCheckPath ? "隐藏" : "显示";
+            checkPathButtonText.text = $"巡检路线({textStr})";
+
+            var currentData = GlobalData.B08StatisticsInfo[stationNames[type]];
+            
+            _daiPaiGongText.text = $"{currentData.waitDispatch}";
+            _daiXunJianText.text = $"{currentData.waitPatrol}";
+            _xunJianZhongText.text = $"{currentData.onPatrol}";
+            _yiXunJianText.text = $"{currentData.patrolCompleted}";
+            
+            var tempSeries = wenTiTongJiBarChart.series;
+            SerieData[] tempDatas = new SerieData[currentData.dates.Count];
+            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(currentData.valueOfDates[i]);
+            }
+            tempSeries[0].data.Clear();
+            tempSeries[0].data.AddRange(tempDatas);
 
-        if (GlobalData.B08_Type != type)
+            if (!GlobalData.B08_Type.Equals(currentIds))
+            {
+                await HttpHelper._Instance.InitGCYWData1(currentIds);
+            }
+            //
+            // SetShuJuTongJiData();
+            // SetXunJianBarChart();
+            // SetGongChengGuanLiChart();
+            // SetTFSJ_Data();
+            //
+            // await HttpHelper._Instance.B08_GetTaskList();
+            // taskListPanel.SetData(this);
+        }
+        catch (Exception e)
         {
-            await HttpHelper._Instance.InitGCYWData1(type);
+            Debug.LogError("GCYWLayer ChangeData error"+e.ToString());
         }
-
-        SetShuJuTongJiData();
-        SetXunJianBarChart();
-        SetGongChengGuanLiChart();
-        SetTFSJ_Data();
-
-        await HttpHelper._Instance.B08_GetTaskList();
-        taskListPanel.SetData(this);
-        //SetWTZG_Data();
-        //SetXJLE_Data();
-        
-        //TaskListPanelObj.SetActive(false);
-        //taskPhotoPanelObj.SetActive(false);
     }
 
     private async void OnEnable()
     {
+        stationNames.Clear();
+        ids.Clear();
+        stationDropdown.ClearOptions();
         
-        ChangeData(1);
-    }
-
-    public void SetShuJuTongJiData()
-    {
-        B08_dataStatis tempData = GlobalData.B08DataStatis;
-        _xunJianRenWuText.text = $"{tempData.data.inspectTask}";
-        _xunJianRenCiText.text = $"{tempData.data.inspectTimes}";
-        _quanBuGongChengText.text = $"{tempData.data.allProject}";
-        _dangRiGongChengText.text = $"{tempData.data.warnProject}";
-        _zhengChangYunXingText.text = $"{tempData.data.normalProject}";
-    }
-
-    public void SetXunJianBarChart()
-    {
-        B08_inspectResult tempData = GlobalData.B08InspectResult;
-
-        var tempSeries = wenTiTongJiBarChart.series;
-
-        SerieData[] tempDatas = new SerieData[tempData.data.question.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.question[i].value);
-        }
-
-        tempSeries[0].data.Clear();
-        tempSeries[0].data.AddRange(tempDatas);
-
-        SerieData[] tempDatas_1 = new SerieData[tempData.data.events.Length];
-        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);
-            tempDatas_1[i].data.Add(tempData.data.events[i].value);
-        }
-
-        tempSeries[1].data.Clear();
-        tempSeries[1].data.AddRange(tempDatas_1);
+        stationNames.AddRange(GlobalData.B08StationList.Keys.ToArray());
+        ids.AddRange(GlobalData.B08StationList.Values.ToArray());
+        stationDropdown.AddOptions(stationNames);
+        stationDropdown.onValueChanged.AddListener(ChangeData);
+        stationDropdown.value = 0;
     }
 
     public void SetGongChengGuanLiChart()
@@ -308,10 +212,10 @@ public class GCYWLayer : YZTRootLayer
             TFSJ_eventItems.Add(tempObj.gameObject);
         }
 
-        _tuFaShiJian_Count_Text.text =
-            $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
-        _tuFaShiJian_Vlaue_Text.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
-        _tuFaShiJian_Slider.fillAmount = float.Parse(tempData.data.completeRate);
+        // _tuFaShiJian_Count_Text.text =
+        //     $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
+        // _tuFaShiJian_Vlaue_Text.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
+        // _tuFaShiJian_Slider.fillAmount = float.Parse(tempData.data.completeRate);
     }
 
     // public void SetWTZG_Data()