1/13

GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity

@@ -13378,6 +13378,86 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &233653883
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 233653884}
+  - component: {fileID: 233653886}
+  - component: {fileID: 233653885}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &233653884
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 233653883}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1554623963}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &233653885
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 233653883}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Button
+--- !u!222 &233653886
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 233653883}
+  m_CullTransparentMesh: 1
 --- !u!1 &235224391
 GameObject:
   m_ObjectHideFlags: 0
@@ -20318,7 +20398,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 59510595}
   m_HandleRect: {fileID: 59510594}
   m_Direction: 2
-  m_Value: 1
+  m_Value: -0.016949153
   m_Size: 0.9999919
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -21330,7 +21410,7 @@ 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: -0.000067794695}
+  m_AnchoredPosition: {x: 0, y: 0.0035999094}
   m_SizeDelta: {x: 318.95, y: 443.74}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &413199003
@@ -24930,7 +25010,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 208, y: -80.9}
+  m_AnchoredPosition: {x: 208, y: -80.8999}
   m_SizeDelta: {x: -1303.1125, y: 40}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &485349801
@@ -25250,6 +25330,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a6c4b2208e4d18346aebace160bba197, type: 3}
+--- !u!224 &493005067 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5513304126125030739, guid: bcce6075fb5400f43a995d7801bac6c9,
+    type: 3}
+  m_PrefabInstance: {fileID: 1577567297}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &496077064
 GameObject:
   m_ObjectHideFlags: 0
@@ -75764,6 +75850,128 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 1959592799}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1554623962
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1554623963}
+  - component: {fileID: 1554623966}
+  - component: {fileID: 1554623965}
+  - component: {fileID: 1554623964}
+  m_Layer: 5
+  m_Name: "\u672A\u5206\u7EC4"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1554623963
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1554623962}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 233653884}
+  m_Father: {fileID: 493005067}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100.1, y: -10}
+  m_SizeDelta: {x: 59, y: 42}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &1554623964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1554623962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1554623965}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1554623965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1554623962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: f3880ea9b5680c946b519f1e0b5f176e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1554623966
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1554623962}
+  m_CullTransparentMesh: 1
 --- !u!1 &1556399343
 GameObject:
   m_ObjectHideFlags: 0
@@ -76974,6 +77182,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4362348816139420719}
     m_Modifications:
+    - target: {fileID: 168195687, guid: bcce6075fb5400f43a995d7801bac6c9, type: 3}
+      propertyPath: line_group_null
+      value: 
+      objectReference: {fileID: 1554623964}
     - target: {fileID: 189903998, guid: bcce6075fb5400f43a995d7801bac6c9, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -77100,6 +77312,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u7EBF\u7F06\u7EC4\u7F16\u8F91\u9762\u677F"
       objectReference: {fileID: 0}
+    - target: {fileID: 5977727791788803776, guid: bcce6075fb5400f43a995d7801bac6c9,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5977727791788803777, guid: bcce6075fb5400f43a995d7801bac6c9,
         type: 3}
       propertyPath: m_Pivot.x
@@ -89317,6 +89534,7 @@ MonoBehaviour:
     jqr_bczb: 
     jqr_xj_cx: 
     jqr_bctp: 
+    xl_wfz: 
     bdsp: 
   arguments:
     token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzU4OTY4NjIsInVzZXJuYW1lIjoiYWRtaW4ifQ.Npm7DV06GqCj2mR7NN5gEChomrCaPYW-C_ECLrOslG8
@@ -114475,7 +114693,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -52.999268, y: 445}
+  m_AnchoredPosition: {x: -52.99951, y: 445}
   m_SizeDelta: {x: -1303.1125, y: -1040}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1332666221008315399
@@ -124575,7 +124793,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -63.999756, y: 487}
+  m_AnchoredPosition: {x: -63.99994, y: 487}
   m_SizeDelta: {x: -1303.1125, y: -1040}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1332666221677478668
@@ -125654,7 +125872,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 441.40015, y: 81.599976}
+  m_AnchoredPosition: {x: 441.40015, y: 81.6001}
   m_SizeDelta: {x: 709, y: 453}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1332666221744640303
@@ -139859,7 +140077,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -142, y: -106.00012}
+  m_AnchoredPosition: {x: -142, y: -106}
   m_SizeDelta: {x: 348, y: 399}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1332666222531522940
@@ -141871,7 +142089,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -419, y: 40.099976}
+  m_AnchoredPosition: {x: -418.99976, y: 40.100098}
   m_SizeDelta: {x: 190, y: 85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1332666222652933238
@@ -150912,6 +151130,11 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1907843773673055311, guid: f12e732b7b6c24e489ac02c8af4e7a78,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1907843773686331072, guid: f12e732b7b6c24e489ac02c8af4e7a78,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -151045,7 +151268,7 @@ PrefabInstance:
     - target: {fileID: 1907843774066353948, guid: f12e732b7b6c24e489ac02c8af4e7a78,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0002884762
+      value: 0.000039426173
       objectReference: {fileID: 0}
     - target: {fileID: 1907843774098386396, guid: f12e732b7b6c24e489ac02c8af4e7a78,
         type: 3}
@@ -176878,7 +177101,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 62.65}
+  m_AnchoredPosition: {x: 0, y: 62.649902}
   m_SizeDelta: {x: -1303.1125, y: 40}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &4362348815989871423

GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupItem.cs

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Unity.VisualScripting;
+//using UnityEditor.Experimental.GraphView;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -197,7 +198,6 @@ public class LineGroupItem : MonoBehaviour
             item.item_tittle_end_text.text = child_line_items[i].item_tittle_end_text.text;
             item.lineGroupItem = child_line_items[i].transform.parent.parent.GetComponent<LineGroupItem>();
             item.gameObject.GetComponent<LocatingCable>().lines = child_line_items[i].GetComponent<LocatingCable>().lines;
-
         }
     }
 }

GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
@@ -69,6 +70,10 @@ public class LineGroupManager : MonoBehaviour
     /// 所有线缆组脚本
     /// </summary>
     public List<LineGroupItem> child_line_group_items = new List<LineGroupItem>();
+    /// <summary>
+    /// 未分组线缆
+    /// </summary>
+    [Header("未分组线缆")] public Button line_group_null;
 
     private void Start()
     {
@@ -109,7 +114,6 @@ public class LineGroupManager : MonoBehaviour
                             {
                                 SecondConfirmPanel.DeleteConform(null, "更新场景失败");
                                 Debug.Log("接口获取数据失败（线缆组新增-初始化失败）");
-
                             }
                         }));
                     }
@@ -184,8 +188,74 @@ public class LineGroupManager : MonoBehaviour
             edit_group_pop.SetActive(false);
             line_group_editName_inputfield.text = string.Empty;
         });
+        line_group_null.onClick.AddListener(() =>
+        {
+            LineQuery.Inst.addxianlan_未分组();
+        }
+        );
     }
 
+    public void showRightPop_未分组(PortQuery.Root root)
+    {
+        this.selected_group_ID = "";
+        this.selected_group_name = "";
+        bool CanAdd = true;
+        List<string> name = new List<string>();
+        List<string> port = new List<string>();
+        LineGroupManager.Instance.Empty_line_content_right();
+        Debug.Log("共有"+root.data.Count+"条数据");
+        for (int i = 0; i < root.data.Count; i++)
+        {
+            //判断是否为初始端口
+            if (root.data[i].startFlag == 0)
+            {
+                CanAdd = false;
+            }
+            Debug.Log(root.data[i].cableName+"第"+i+"条数据");
+            for (int k = 0; k < name.Count; k++)
+            {
+                //判断是否为重复数据
+                if (root.data[i].conPort == port[k]) 
+                {
+                    Debug.Log("重复数据" + root.data[i].cableName);
+                    CanAdd = false;
+                }
+            }
+            if (CanAdd)
+            {
+                var v = GameObject.FindObjectsOfType<PortQuery>().FirstOrDefault(x => x.portList.id != null && x.portList.id == root.data[i].id);
+                //用来保证在场景未实例化之前不实例化任何实际的UI
+                if (v == null) {
+                    SecondConfirmPanel.DeleteConform(null, "");
+                    return;
+                }
+                   
+                Debug.Log("添加数据" + root.data[i].cableName);
+                LineItem item = LineObjectPool.Instance.GetItemFromPool<LineItem>();
+                item.gameObject.GetComponent<LocatingCable>().lines.Clear();
+                item.transform.SetParent(LineGroupManager.Instance.line_content_right.transform);
+                item.info_text.text = root.data[i].cableName;//线缆名
+                item.gameObject.GetComponent<LocatingCable>().lines.Add(v.transform);
+                var g = GameManager.Inst.FindParent(v.gameObject, GameManager.Inst.IsDesiredParent);
+                item.item_tittle_start_text.text = g.name + " " + root.data[i].deviceName + " #" + root.data[i].port;//机柜名   所属设备名   #端口号
+                for (int z = 0; z < root.data.Count; z++)
+                {
+                    if (root.data[z].port == root.data[i].conPort)
+                    {
+                        var m = GameObject.FindObjectsOfType<PortQuery>().FirstOrDefault(x => x.portList.id != null && x.portList.id == root.data[z].id);
+                        var n = GameManager.Inst.FindParent(m.gameObject, GameManager.Inst.IsDesiredParent);
+                        item.item_tittle_end_text.text = n.name + " " + root.data[i].conDeviceName + " ##" + root.data[i].conPort;
+                        item.gameObject.GetComponent<LocatingCable>().lines.Add(m.transform);
+                    }
+                }
+                name.Add(root.data[i].cableName);
+                port.Add(root.data[i].port);
+            }
+            CanAdd = true;
+        }
+    }
+
+
     /// <summary>
     /// 根据数据库生成线缆并添加至列表
     /// </summary>
@@ -204,7 +274,6 @@ public class LineGroupManager : MonoBehaviour
                 //if (xianlan.transform.GetChild(j).GetComponent<LineInfor>().cableGroupName == child_line_group_items[i].info_text.text)
                 if (xianlan.transform.GetChild(j).name == child_line_group_items[i].info_text.text)
                 {
-
                     //lineGroupItem.AddLineItem(xianlan.transform.GetChild(j).GetComponent<LineInfor>().cableName);
                     //foreach (var item in xianlan.transform.GetChild(j).GetComponentsInChildren<LineInfor>(true))
                     foreach (var item in xianlan.transform.GetChild(j).GetComponentsInChildren<LineRendererInteraction>(true))
@@ -231,7 +300,6 @@ public class LineGroupManager : MonoBehaviour
                                     item.port_A_cabinet+"$"+item.port_A_deviceName+"$#"+item.port_A,
                                 };
                             }
-
                             lineGroupItem.AddLineItem(item.name, lines, strings);
                         }
                     }

GQ_URP/GQ/Assets/Scripts/WJ/UIToCabinet.cs

@@ -60,7 +60,6 @@ public class UIToCabinet : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-
         enter_home.onClick.AddListener(() =>
         {
             mask_img.SetActive(false);
@@ -96,15 +95,11 @@ public class UIToCabinet : MonoBehaviour
 
             for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++)
                 GameManager.Inst.Cabinets_go[i].transform.Find("高亮").gameObject.SetActive(false);
-
-
             for (int i = 0; i < GameManager.Inst.pop_ups.Count; i++)
                 GameManager.Inst.pop_ups[i].SetActive(false);
-
             for (int i = 0; i < second_level_menu.Count; i++)
                 second_level_menu[i].SetActive(false);
             first_level_menu.SetActive(false);
-
         });
         for (int i = 0; i < toggles.Count; i++)
         {
@@ -115,7 +110,6 @@ public class UIToCabinet : MonoBehaviour
                 {
                     return;
                 }
-
                 if (!toggles[index].gameObject.activeInHierarchy || mask_img.activeSelf)
                     return;
                 if (ison)
@@ -140,7 +134,6 @@ public class UIToCabinet : MonoBehaviour
                                         {
                                             cjgl_Toggle.isOn = true;
                                             cjgl_Toggle_1.isOn = true;
-
                                             Stagin.gameObject.SetActive(true);
                                             isgo = false;
                                             return;
@@ -249,7 +242,7 @@ public class UIToCabinet : MonoBehaviour
             case "Toggle_数字机房":
                 {
                     for (int i = 0; i < second_level_menu.Count; i++)
-                        second_level_menu[i].SetActive(false);
+                    second_level_menu[i].SetActive(false);
                     second_level_menu[2].SetActive(true);
                     string s = "";
                     for (int i = 12; i < 16; i++)
@@ -298,9 +291,10 @@ public class UIToCabinet : MonoBehaviour
                             return;
                         }
                         CabinetUIManager.ChangeMenu(Menu.M_全景监控_设备告警);
-
+                        //修改ison属性使之只有当前记录的按钮为true
-                        
                     }));
+                    WebInteraction.Inst.setMenuIsOn_3_All_false();
+                    WebInteraction.Inst.setMenuIson_3_true(toggle_name);
                 }
                 break;
             case "Toggle_全景监控":
@@ -327,6 +321,7 @@ public class UIToCabinet : MonoBehaviour
                         {
                             s = WebInteraction.Inst.menu_struct[i].toggle.gameObject.name;
                             WebInteraction.Inst.menu_struct[i].toggle.isOn = true;
+                            //除了开始之后，便把初始的设备告警的_ison给修改成false
                             break;
                         }
                     }
@@ -363,8 +358,10 @@ public class UIToCabinet : MonoBehaviour
                         searchName.inputField.text = string.Empty;
                         ExtendedFlycam.Inst.QieHuan(Menu.M_全景监控_温度);
                         CabinetUIManager.ChangeMenu(Menu.M_全景监控_温度);
-
                         isContinue_menu = true;
+                        //修改ison属性使之只有当前记录的按钮为true
+                        WebInteraction.Inst.setMenuIsOn_3_All_false();
+                        WebInteraction.Inst.setMenuIson_3_true(toggle_name);
                     }));
                 }
                 break;
@@ -379,8 +376,10 @@ public class UIToCabinet : MonoBehaviour
                     searchName.inputField.text = string.Empty;
                     ExtendedFlycam.Inst.QieHuan(Menu.M_全景监控_柜门状态);
                     CabinetUIManager.ChangeMenu(Menu.M_全景监控_柜门状态);
-
                     isContinue_menu = true;
+                    //修改ison属性使之只有当前记录的按钮为true
+                    WebInteraction.Inst.setMenuIsOn_3_All_false();
+                    WebInteraction.Inst.setMenuIson_3_true(toggle_name);
                 }
                 break;
             case "Toggle_红外监测":
@@ -391,8 +390,10 @@ public class UIToCabinet : MonoBehaviour
                     IRPopup.Inst.LoadmoreDetails();
                     ExtendedFlycam.Inst.QieHuan(Menu.M_全景监控_红外监测);
                     CabinetUIManager.ChangeMenu(Menu.M_全景监控_红外监测);
-
                     isContinue_menu = true;
+                    //修改ison属性使之只有当前记录的按钮为true
+                    WebInteraction.Inst.setMenuIsOn_3_All_false();
+                    WebInteraction.Inst.setMenuIson_3_true(toggle_name);
                 }
                 break;
             case "Toggle_现场作业":
@@ -407,8 +408,10 @@ public class UIToCabinet : MonoBehaviour
                     }
                     ExtendedFlycam.Inst.QieHuan(Menu.M_全景监控_现场作业);
                     CabinetUIManager.ChangeMenu(Menu.M_全景监控_现场作业);
-
                     isContinue_menu = true;
+                    //修改ison属性使之只有当前记录的按钮为true
+                    WebInteraction.Inst.setMenuIsOn_3_All_false();
+                    WebInteraction.Inst.setMenuIson_3_true(toggle_name);
                 }
                 break;
             case "Toggle_摄像头":
@@ -434,6 +437,9 @@ public class UIToCabinet : MonoBehaviour
                     LocalVideo.Inst.RecoveryUI();
                     LocalVideo.Inst.AssignDataToUI();
                     isContinue_menu = true;
+                    //修改ison属性使之只有当前记录的按钮为true
+                    WebInteraction.Inst.setMenuIsOn_3_All_false();
+                    WebInteraction.Inst.setMenuIson_3_true(toggle_name);
                 }
                 break;
             case "Toggle_机柜容量":
@@ -501,7 +507,6 @@ public class UIToCabinet : MonoBehaviour
                     ExtendedFlycam.Inst.QieHuan(Menu.M_数字机房_智能巡检);
                     CabinetUIManager.ChangeMenu(Menu.M_数字机房_智能巡检);
                     ExtendedFlycam.Inst.room = ExtendedFlycam.Room.None;
-
                     isContinue_menu = true;
                 }
                 break;

GQ_URP/GQ/Assets/StreamingAssets/editorDebugging.txt

@@ -6,7 +6,7 @@
 		"heatThresholdValueMin": "5",
 		"humidityThresholdValueMax": "20",
 		"humidityThresholdValueMin": "80",
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzYzMjc4NzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.g7GbqWmwv0Fct3QhwMOIZtfDo8brbxkApWVnzLlrKJY"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzY1NTkwODQsInVzZXJuYW1lIjoiYWRtaW4ifQ.IAI6zYS9sW7LCC7q8ycYmEGcXo7JgFZlx5JztND-LnQ"
 	},
 	"serverTime": "1715417370490"
 }

GQ_URP/GQ/Assets/UI/线缆连接切图/未分配.png.meta

@@ -0,0 +1,134 @@
+fileFormatVersion: 2
+guid: f3880ea9b5680c946b519f1e0b5f176e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GQ_URP/GQ/Assets/script/GameManager.cs

@@ -1368,23 +1368,19 @@ public class GameManager : MonoBehaviour
             //return true;
         })/*.Select(item => item.gameObject).ToArray()*/;
         var P_list = FindObjectGroups(pqs.ToList());
-
         CreateLine createLine = PatternChoose.Inst.huaXian.GetComponent<CreateLine>();
-
         createLine.list7.Clear();
         foreach (var item in P_list)
         {
             createLine.list7.Add(item[0].transform);
             createLine.list7.Add(item[1].transform);
         }
-
         createLine.F7();
     }
 
     public List<List<PortQuery>> FindObjectGroups(List<PortQuery> objects)
     {
         List<List<PortQuery>> objectGroups = new List<List<PortQuery>>();
-
         for (int i = 0; i < objects.Count; i++)
         {
             PortQuery objectA = objects[i];
@@ -2132,10 +2128,8 @@ public class GameManager : MonoBehaviour
             {
                 return parent.gameObject;
             }
-
             parent = parent.parent;
         }
-
         return null;
     }
 
@@ -2363,6 +2357,7 @@ public class GameManager : MonoBehaviour
                                             Debug.Log("查询线路类型错误 @@5.1");
                                             callback.Invoke(null);
                                         }
+
                                     }));
                                 }
                                 else
@@ -2797,6 +2792,11 @@ public class GameManager : MonoBehaviour
         [Header("机器人返回图片保存接口")] public string jqr_bctp;
         /*----------------------------------------------------------------------------------*/
         /// <summary>
+        /// 未分组线缆
+        /// </summary>
+        [Header("未分组线缆")] public string xl_wfz;
+        /*----------------------------------------------------------------------------------*/
+        /// <summary>
         /// 本地视频接口
         /// </summary>
         [Header("本地视频")] public string bdsp;
@@ -2823,7 +2823,10 @@ public class GameManager : MonoBehaviour
 
             xl_sc = ct + "port/clearConPort";
 
+            //1/8新加
+            xl_wfz = ct + "port/queryForUnassignedCables";
             xlz_cx = ct + "deviceLine/queryList";
+            
             xlz_xz = ct + "deviceLine/save";
             xlz_sc = ct + "deviceLine/delete";
             xlz_bj = ct + "deviceLine/updateById";

GQ_URP/GQ/Assets/script/前端交互/WebInteraction.cs

@@ -158,7 +158,7 @@ public class WebInteraction : MonoBehaviour
         //    {
         //        Debug.Log("获取地址错误!");
         //    }
-        //}));
+        // }));
 #endif
         //StartCoroutine(QiangZhi());
     }
@@ -276,7 +276,6 @@ public class WebInteraction : MonoBehaviour
                             }));
                         }
                         #endregion
-
                         gameManager.isgonging = true;
                     }
                     else
@@ -457,7 +456,7 @@ public class WebInteraction : MonoBehaviour
                     }
                 }
                 else
-                    secondary_menu[i].GetChild(j).GetComponent<Toggle>().isOn = false;
+                secondary_menu[i].GetChild(j).GetComponent<Toggle>().isOn = false;
             }
         }
     }
@@ -474,6 +473,27 @@ public class WebInteraction : MonoBehaviour
         menu_Struct._ison = true;
         menu_Struct.toggle.isOn = true;
     }
+
+    public void setMenuIson_3_true(string name) 
+    {
+        for (int i = 6; i < 12; i++) 
+        {
+            if (menu_struct[i].toggle.gameObject.name == name)
+            {
+                this.menu_struct[i]._ison = true;
+            }
+        }
+    }
+
+    public void setMenuIsOn_3_All_false()
+    {
+        for (int i = 6; i < 12; i++)
+        {
+            menu_struct[i]._ison = false;           
+        }
+    }
+
+
     /// <summary>
     /// 隐藏所有菜单
     /// </summary>

GQ_URP/GQ/Assets/script/接口/查询/LineQuery.cs

@@ -129,8 +129,6 @@ public class LineQuery : MonoBehaviour
                     callback?.Invoke("1");
                 }
                 //));
-
-
             }
             else
             {
@@ -139,7 +137,6 @@ public class LineQuery : MonoBehaviour
                 callback.Invoke(null);
             }
         }));
-
     }
 
     /// <summary>
@@ -206,21 +203,93 @@ public class LineQuery : MonoBehaviour
     public IEnumerator getJson(Root root, Action<Root> callback)
     {
         yield return
-            StartCoroutine(
+        StartCoroutine
-                CombineJSON.GetJson_POST(GameManager.Inst.Jk_URL.xlz_cx, GameManager.Inst.arguments.token, (jsonResult) =>
+        (
+            CombineJSON.GetJson_POST(GameManager.Inst.Jk_URL.xlz_cx, GameManager.Inst.arguments.token, (jsonResult) =>
+            {
+                 try
+                 {
+                    root = JsonConvert.DeserializeObject<Root>(jsonResult);
+                    callback?.Invoke(root);
+                 }
+                 catch (Exception e)
+                 {
+                    Debug.Log("查询线缆组接口错误：" + e.Message);
+                    callback.Invoke(null);
+                 }
+            })
+        );
+    }
+
+    /// <summary>
+    /// 查询
+    /// </summary>
+    public void addxianlan_未分组()
+    {
+        PortQuery.Root root = new PortQuery.Root();
+        StartCoroutine(LineQuery.Inst.getJson_未分组(root, (x) =>
+        {
+            root = x;
+            if (root != null && root.message == "操作成功")
+            {
+                LineGroupManager.Instance.showRightPop_未分组(root);
+                if (root.data != null && root.data.Count > 0)
                 {
-                    try
+                    for (int i = 0; i < root.data.Count; i++)
-                    {
+                     {
-                        root = JsonConvert.DeserializeObject<Root>(jsonResult);
+                        Debug.Log(root.data[i]);
-                        callback?.Invoke(root);
+                        /*
+                        if (!keyValues.ContainsKey(root.data[i].lineContentJson))
+                            {
+                                keyValues.Add(root.data[i].lineContentJson, root.data[i].id);
+                                var d = new Dic();
+                                d.id = root.data[i].id;
+                                d.lineContentJson = root.data[i].lineContentJson;
+                                dic.Add(d);
+                                LineGroupManager.Instance.AddLineGroup(d.lineContentJson, root.data[i].id);
+                        }
+                       */
                     }
-                    catch (Exception e)
+                    //callback?.Invoke(true, "1");
-                    {
+                }
-                        Debug.Log("²éѯÏßÀÂ×é½Ó¿Ú´íÎó£º" + e.Message);
+                else
-                        callback.Invoke(null);
+                {
-                    }
+                    //  keyValues.Clear();
-                })
+                    //  dic.Clear();
-            );
+                    //  callback?.Invoke(false, "1");
+                }
+            }
+            else
+            {
+                Debug.Log("查询线缆组失败: " + root != null ? root.message : "查询线缆组失败");
+            }
+        }));
+    }
+
+
+
+    /// <summary>
+    /// 查询未分组
+    /// </summary>
+    public IEnumerator getJson_未分组(PortQuery.Root root, Action<PortQuery.Root> callback)
+    {
+        yield return
+        StartCoroutine
+        (
+            CombineJSON.GetJson_POST(GameManager.Inst.Jk_URL.xl_wfz, GameManager.Inst.arguments.token, (jsonResult) =>
+            {
+                try
+                {
+                    root = JsonConvert.DeserializeObject<PortQuery.Root>(jsonResult);
+                    callback?.Invoke(root);
+                }
+                catch (Exception e)
+                {
+                    Debug.Log("查询线缆未分组接口错误：" + e.Message);
+                    callback.Invoke(null);
+                }
+            })
+        );
     }
 
     /// <summary>

GQ_URP/GQ/Assets/script/接口/查询/PortQuery.cs

@@ -201,6 +201,4 @@ public class PortQuery : MonoBehaviour
         public List<PortList> data;
     }
     #endregion
-
-
 }

GQ_URP/GQ/ProjectSettings/ProjectSettings.asset

@@ -50,8 +50,8 @@ PlayerSettings:
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1024
   defaultScreenHeight: 768
-  defaultScreenWidthWeb: 1920
+  defaultScreenWidthWeb: 960
-  defaultScreenHeightWeb: 1080
+  defaultScreenHeightWeb: 540
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 1
   m_MTRendering: 1