Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

Assets/SandBox/JBQ/JBQ_Test.cs

@@ -30,12 +30,12 @@ public class JBQ_Test : MonoBehaviour
             //});
 
             ///4.工作票选择面板
-            //UIManager.Instance.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.System, (panel) =>
+            UIManager.Instance.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.System, (panel) =>
-            //{
+            {
-            //    ProcessManager.Instance.mode = E_ModeType.Study;
+                ProcessManager.Instance.mode = E_ModeType.Study;
-            //    panel.Init();
+                panel.Init(4);
 
-            //});
+            });
 
             ///5.顶部提示面板
             //UIManager.Instance.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
@@ -65,11 +65,11 @@ public class JBQ_Test : MonoBehaviour
             //});
 
             ///8.电能计量装置装拆工单
-            UIManager.Instance.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.System, (panel) =>
+            //UIManager.Instance.ShowPanel<UI_InstallAndDismantleTicketPanel>(E_UI_Layer.System, (panel) =>
-            {
+            //{
-                //panel.Init();
+            //    //panel.Init();
 
-            });
+            //});
         }
 
         if (Input.GetKeyDown(KeyCode.L))

Assets/Scripts/Project/Manager/RunModelMgr.cs

@@ -22,6 +22,7 @@ public class RunModelMgr : BaseManager<RunModelMgr>
     /// </summary>
     public int deviceId;
 
+
     public E_ModeType ModeType
     {
         get => modeType;

Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs

@@ -1,6 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Timers;
 using TMPro;
+using Unity.VisualScripting;
 using UnityEditor.VersionControl;
 using UnityEngine;
 using UnityEngine.UI;
@@ -8,13 +10,21 @@ using UnityEngine.UI;
 public class UI_InstallAndDismantleTicketPanel : BasePanel
 {
     /// <summary>
-    /// 是否提交
+    /// 是否已经按确认提交
     /// </summary>
-    private bool submite;
+    private bool submit=false;
-    private Image Image_Mask;
+    public int triggerID;
     public void Init(int triggerID)
     {
-
+        this.triggerID = triggerID;
+        if (submit==true)
+        {
+            Submit();
+        }
+        else
+        {
+            NotSubmited();
+        }
     }
 
 
@@ -27,12 +37,12 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
         switch (btnName)
         {
             case "Button_Confirm":
-                submite = true;
+                submit = true;
-                Debug.Log(1);
+                Debug.Log(submit);
-                Submit();
                 break;
             case "Button_Close":
-                GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
+
+                UIManager.Instance.HidePanel<UI_InstallAndDismantleTicketPanel>();
                 break;
 
         }
@@ -49,14 +59,10 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
         {
 
             TMP_InputField inputField = child.GetComponent<TMP_InputField>();
-
-            // 如果找到了TMP_InputField组件，则禁用它  
             if (inputField != null)
             {
                 inputField.enabled = false;
             }
-
-
             DisableRecursiveInputFields(child);
         }
     }
@@ -73,7 +79,7 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
             {
                 inputField.enabled = false;
             }
-            DisableRecursiveInputFields(child); // 递归调用  
+            DisableRecursiveInputFields(child);
         }
     }
     /// <summary>
@@ -81,6 +87,31 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
     /// </summary>
     private void NotSubmited()
     {
-
+        GameObject viewport = GetControl<Image>("Viewport").gameObject;
+        if (viewport != null)
+        {
+            ClearInputFieldsInChildren(viewport.transform);
+            Debug.Log("找到了");
         }
+    }
+
+    /// <summary>
+    /// 递归函数，用于遍历所有子物体并清空InputField
+    /// </summary>
+    /// <param name="parent"></param>
+    void ClearInputFieldsInChildren(Transform parent)
+    {
+        for (int i = 0; i < parent.childCount; i++)
+        {
+            Transform child = parent.GetChild(i);
+
+            TMP_InputField inputField = child.GetComponent<TMP_InputField>();
+            if (inputField != null)
+            {
+                inputField.text = "";
+            }
+            ClearInputFieldsInChildren(child);
+        }
+    }
+    
 }