巡检任务又改一次

Assets/Prefabs/UI/Item/xunJianRenWuItem.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: 30, y: -19.700012}
-  m_SizeDelta: {x: 24, y: 16}
+  m_AnchoredPosition: {x: 43.185913, y: -19.700012}
+  m_SizeDelta: {x: 50.3718, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &599252985667402459
 CanvasRenderer:
@@ -79,7 +79,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7C7B\u578B"
+  m_Text: "\u7C7B\u578B\u7C7B\u578B"
 --- !u!1 &1807477830894366903
 GameObject:
   m_ObjectHideFlags: 0
@@ -268,17 +268,14 @@ MonoBehaviour:
   PointItems: []
   itemContent: {fileID: 2753270198851302937}
   InfoData:
-    xjId: 
-    fanganId: 
-    projectId: 
-    xunjianScope: 
-    taskExecutor: 0
-    fanganName: 
-    xunjian_scope: 
+    id: 
+    type: 
+    title: 
     status: 
-    startTime: 
+    createTime: 
     finishedTime: 
-    items: []
+    taskItems: []
+    Locations: []
   gcywLayer: {fileID: 0}
 --- !u!1 &3468084397990988624
 GameObject:
@@ -477,8 +474,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: 108.5, y: -19.700012}
-  m_SizeDelta: {x: 50, y: 16}
+  m_AnchoredPosition: {x: 129.92719, y: -19.700012}
+  m_SizeDelta: {x: 106.0402, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9118758874479972441
 CanvasRenderer:

Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -4608,12 +4608,13 @@ RectTransform:
   - {fileID: 1673002594449356042}
   - {fileID: 3502951557476960294}
   - {fileID: 8333797303366140236}
+  - {fileID: 6472426010106365378}
   m_Father: {fileID: 7289340260209060652}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 311, y: 63}
+  m_AnchoredPosition: {x: 740, y: -202}
   m_SizeDelta: {x: 400, y: 588}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6875934662893550125
@@ -4747,10 +4748,12 @@ MonoBehaviour:
   taskTpye_diFangButton: {fileID: 7710401499482457847}
   taskTpye_jianZhuButton: {fileID: 4512943782696283477}
   taskTpye_zhuanXiangButton: {fileID: 836466720067733596}
+  inputField: {fileID: 8844670680132909736}
   taskItemPrefab: {fileID: 3399567085900872481, guid: 83879d5dd735d35419b810abc60d8842, type: 3}
   itemContent: {fileID: 2985704268949981555}
   taskItemList: []
   gcywLayer: {fileID: 0}
+  taskInfoList: []
 --- !u!1 &614991500497924390
 GameObject:
   m_ObjectHideFlags: 0
@@ -4845,7 +4848,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4449008148277711001
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4864,7 +4867,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 230, y: -64}
+  m_AnchoredPosition: {x: 230, y: -80}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7422186985985109967
@@ -5055,7 +5058,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -53}
+  m_AnchoredPosition: {x: 200, y: -112}
   m_SizeDelta: {x: 360, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390109443813693614
@@ -6567,8 +6570,8 @@ 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: -321.07}
-  m_SizeDelta: {x: 374, y: 512.14}
+  m_AnchoredPosition: {x: 0, y: -350.57}
+  m_SizeDelta: {x: 374, y: 453.14}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5929286935601914745
 CanvasRenderer:
@@ -9285,9 +9288,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -3, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8876799351185516550
 CanvasRenderer:
@@ -10757,7 +10760,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &252656590667301376
 RectTransform:
   m_ObjectHideFlags: 0
@@ -10776,7 +10779,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -64}
+  m_AnchoredPosition: {x: 50, y: -80}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3542712389411464932
@@ -14435,9 +14438,9 @@ RectTransform:
   m_Father: {fileID: 8550953090553169079}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 185.5, y: -12}
   m_SizeDelta: {x: 360, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3554533741406128052
@@ -15978,7 +15981,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8209747834125775395
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15997,7 +16000,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 170, y: -64}
+  m_AnchoredPosition: {x: 170, y: -80}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3451486952336604915
@@ -16999,6 +17002,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3231007748538716867
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7026152810167258569}
+  - component: {fileID: 3003459364088682716}
+  - component: {fileID: 250691158295509092}
+  m_Layer: 5
+  m_Name: Placeholder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7026152810167258569
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3231007748538716867}
+  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: 6472426010106365378}
+  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: -20, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3003459364088682716
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3231007748538716867}
+  m_CullTransparentMesh: 1
+--- !u!114 &250691158295509092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3231007748538716867}
+  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.64705884, g: 0.7490196, b: 0.8862745, a: 0.5}
+  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: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u6807\u9898\u5185\u5BB9"
 --- !u!1 &3276918641116489458
 GameObject:
   m_ObjectHideFlags: 0
@@ -24150,6 +24233,82 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 360, y: 187}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &4038926061603833824
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7627267318750525074}
+  - component: {fileID: 8385953329394017460}
+  - component: {fileID: 8613708188452652848}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7627267318750525074
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4038926061603833824}
+  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: 6472426010106365378}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 170, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8385953329394017460
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4038926061603833824}
+  m_CullTransparentMesh: 1
+--- !u!114 &8613708188452652848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4038926061603833824}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 2688ec8d789687047ba943349cd3deb5, 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!1 &4040614548108744028
 GameObject:
   m_ObjectHideFlags: 0
@@ -26681,7 +26840,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4403327642199857703
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26700,7 +26859,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 290, y: -64}
+  m_AnchoredPosition: {x: 290, y: -80}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3653112825539321594
@@ -26803,7 +26962,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1673002594449356042
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26822,7 +26981,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 350, y: -64}
+  m_AnchoredPosition: {x: 350, y: -80}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6004017182831154438
@@ -32510,7 +32669,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &361473420222608148
 RectTransform:
   m_ObjectHideFlags: 0
@@ -33537,7 +33696,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6504405168712864162
 RectTransform:
   m_ObjectHideFlags: 0
@@ -33556,7 +33715,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 110, y: -64}
+  m_AnchoredPosition: {x: 110, y: -80}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1274173220520727548
@@ -35256,6 +35415,256 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5880427519936219692
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6472426010106365378}
+  - component: {fileID: 7331815782834182826}
+  - component: {fileID: 1339926078816687535}
+  - component: {fileID: 8844670680132909736}
+  - component: {fileID: 907215360632648768}
+  - component: {fileID: 6291814668833473379}
+  m_Layer: 5
+  m_Name: InputField
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6472426010106365378
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5880427519936219692}
+  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: 7026152810167258569}
+  - {fileID: 4852010596635723320}
+  - {fileID: 7627267318750525074}
+  m_Father: {fileID: 3974836821683349703}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 200, y: -48.300003}
+  m_SizeDelta: {x: 360, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7331815782834182826
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5880427519936219692}
+  m_CullTransparentMesh: 1
+--- !u!114 &1339926078816687535
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5880427519936219692}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.12156863}
+  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: 0}
+  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
+  m_DrawShape: 3
+  m_ImageType: 0
+  m_MaterialMode: 0
+  m_StrokeWidth: 0
+  m_OutlineWidth: 1
+  m_OutlineColor: {r: 0.17254902, g: 0.61960787, b: 0.8352941, a: 0.5019608}
+  m_FalloffDistance: 0.5
+  m_ConstrainRotation: 1
+  m_ShapeRotation: 0
+  m_FlipHorizontal: 0
+  m_FlipVertical: 0
+  m_Triangle:
+    m_CornerRadius: {x: 0, y: 0, z: 0}
+    m_UniformCornerRadius: 0
+  m_Rectangle:
+    m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
+    m_UniformCornerRadius: 1
+  m_Circle:
+    m_Radius: 0
+    m_FitRadius: 0
+  m_Pentagon:
+    m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
+    m_UniformCornerRadius: 0
+    m_TipRadius: 0.001
+    m_TipSize: 1
+  m_Hexagon:
+    m_CornerRadius: {x: 1, y: 1, z: 1, w: 1}
+    m_UniformCornerRadius: 0
+    m_TipSize: {x: 1, y: 1}
+    m_UniformTipSize: 0
+    m_TipRadius: {x: 1, y: 1}
+    m_UniformTipRadius: 0
+  m_NStarPolygon:
+    m_SideCount: 3
+    m_Inset: 2
+    m_CornerRadius: 0
+    m_Offset: {x: 0, y: 0}
+  m_GradientEffect:
+    m_Enabled: 0
+    m_GradientType: 0
+    m_Gradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_CornerGradientColors:
+    - {r: 0, g: 0, b: 0, a: 0}
+    - {r: 0, g: 0, b: 0, a: 0}
+    - {r: 0, g: 0, b: 0, a: 0}
+    - {r: 0, g: 0, b: 0, a: 0}
+    m_Rotation: 0
+--- !u!114 &8844670680132909736
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5880427519936219692}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, 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: 1339926078816687535}
+  m_TextComponent: {fileID: 364628644625726413}
+  m_Placeholder: {fileID: 250691158295509092}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnSubmit:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
+  m_ShouldActivateOnSelect: 1
+--- !u!114 &907215360632648768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5880427519936219692}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cc33a39070010f94fb1c2dd721c1286d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  showHtmlElement: 0
+--- !u!114 &6291814668833473379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5880427519936219692}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56393f797a0f7e94e95547f5052052a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5884325807958559438
 GameObject:
   m_ObjectHideFlags: 0
@@ -36251,15 +36660,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   viewMode: 0
   eventListItemPrefab: {fileID: 8252051226800486078, guid: bcce8bd84cd642844a87a5e502237456, type: 3}
-  TaskListPanelObj: {fileID: 606132492758370437}
   taskListPanel: {fileID: 1035629439663650038}
-  taskPhotoPanelObj: {fileID: 8782026538794920961}
-  taskPhotoPanel: {fileID: 2016937358510215112}
   taskPointIconPrefab: {fileID: 9160985709865876312, guid: 584993b872c11484788bbf22515b9e32, type: 3}
   taskPointIconContent: {fileID: 7813683317312756564}
   taskPointIcons: []
   taskPointLineRenderer: {fileID: 2184664091310860110}
-  closePanelBtn: {fileID: 2637482160221612901}
 --- !u!1 &6125915536224638305
 GameObject:
   m_ObjectHideFlags: 0
@@ -36633,7 +37038,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3773958544188447098
 RectTransform:
   m_ObjectHideFlags: 0
@@ -37393,8 +37798,8 @@ RectTransform:
   m_Father: {fileID: 8328626770931094525}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.6533333}
+  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}
@@ -43428,6 +43833,86 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7210083489178922398
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4852010596635723320}
+  - component: {fileID: 2635502276581056906}
+  - component: {fileID: 364628644625726413}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4852010596635723320
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7210083489178922398}
+  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: 6472426010106365378}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -5, y: 0}
+  m_SizeDelta: {x: -30, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2635502276581056906
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7210083489178922398}
+  m_CullTransparentMesh: 1
+--- !u!114 &364628644625726413
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7210083489178922398}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!1 &7215580824369220135
 GameObject:
   m_ObjectHideFlags: 0
@@ -43902,7 +44387,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1765636839580353836}
   m_HandleRect: {fileID: 4013672342170617248}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -50913,27 +51398,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3e70fe1e9e5103942bbcc5282f70eb36, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  img: {fileID: 4623039173086719335}
-  posText: {fileID: 7782103973215281614}
-  messageText: {fileID: 3201893984648283857}
-  pageText: {fileID: 3925767835218230903}
-  lastItem: {fileID: 3893038703846535812}
-  nextItem: {fileID: 8634235543523159781}
-  task_item:
-    xjItemId: 
-    xjId: 
-    faItemId: 
-    remark: 
-    files: []
-    latitude: 
-    longitude: 
-    status: 
-    startTime: 
-    finishedTime: 
-    faItemName: 
-  currentIndex: 0
-  dateText: {fileID: 7027562595760644759}
-  _timeInfo: 
 --- !u!1 &8800537368483757876
 GameObject:
   m_ObjectHideFlags: 0
@@ -51305,7 +51769,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7656964455378578612
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scripts/HttpGetData.cs

@@ -336,33 +336,46 @@ public class CharData_water
 [Serializable]
 public class B08_TaskListInfoData
 {
-    public B08_TaskInfoData[] data;
+    public int total;
+    public B08_TaskListData[] rows;
+}
+
+[Serializable]
+public class B08_TaskListData
+{
+    public string id;
+    public string code;
+    public string title;
+    public string createTime;
+    public string content;
+    public int status;
+    public B08_TaskInfoData infoData;
+}
+
+[Serializable]
+public class B08_TaskInfo
+{
+    public B08_TaskInfoData Data;
 }
 
 [Serializable]
 public class B08_TaskInfoData
 {
-    public string xjId;
-    public string fanganId;
-    public string projectId;
-    public string xunjianScope;
-    public string taskExecutor;
-    [FormerlySerializedAs("type")] public string fanganName;
-    public string xunjian_scope;
+    public string id;
+    public string type;
+    public string title;
     public string status;
-    public string startTime;
+    public string createTime;
     public string finishedTime;
-    [FormerlySerializedAs("task_items")] public B08_TaskItems[] items;
+    public B08_TaskItems[] taskItems;
+    public B08_TaskLocation[] Locations;
 }
 [Serializable]
 public class B08_TaskItems
 {
-    [FormerlySerializedAs("item_id")] public string xjItemId;
-    public string xjId;
-    public string faItemId;
-    
-    public string remark;
-    public B08_TaskItemFiles[] files;
+    public string id;
+    public string itemName;
+    public string itemDescription;
     
     public string latitude;//维度
     public string longitude;//经度
@@ -371,21 +384,63 @@ public class B08_TaskItems
 
     public string startTime;
     public string finishedTime;
+}
+
+[Serializable]
+public class B08_TaskLocationInfo
+{
+    public B08_TaskLocation[] data;
 
-    [FormerlySerializedAs("item_name")] public string faItemName;
 }
 
 [Serializable]
-public class B08_TaskItemFiles
+public class B08_TaskLocation
 {
-    public string fileId;
-    public int fileCategoryId;
-    public string fileName;
-    public string mimeType;
-    public string filePath;
-    public int folderId;
+    public string id;
+    public string workOrderId;
+    public string workOrderCode;
+    public string workOrderTitle;
+
+    public string latitude;//维度
+    public string longitude;//经度
+
+    public string locationType;
+
+    public string recordTime;
+    public string locationTypeName;
+    
+    public string createTime;
+    public string creatorName;
+    public string remark;
+    public string createBy;
 }
 
 
+// [Serializable]
+// public class B08_TaskItemFiles
+// {
+//     public string fileId;
+//     public int fileCategoryId;
+//     public string fileName;
+//     public string mimeType;
+//     public string filePath;
+//     public int folderId;
+// }
+
+
+
+#endregion
+
+[Serializable]
+public class GetToken
+{
+    public TokenData data;
+}
+
+[Serializable]
+public class TokenData
+{
+    public string token;
+}
 
-#endregion
+//{"code":200,"msg":"操作成功","data":{"token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJVSFBzb1JsNnh1YlhZWDA2eWF1OTNvcmJlZXk5ejhwNSIsInVzZXJJZCI6MX0.V82KnJFElRF0-QdXqG2sGYH1g7SWiKvOcB0rTN1vspo"}}

Assets/Scripts/HttpHelper.cs

@@ -55,7 +55,6 @@ public class HttpHelper : MonoBehaviour
         //}
     }
 
-
     private async void Awake()
     {
         _Instance = this;
@@ -2094,36 +2093,67 @@ public class HttpHelper : MonoBehaviour
             Debug.LogWarning("获取API_B08_event数据不成功,原因:" + e.ToString());
         }
 
-        try
+        // try
+        // {
+        //     jsonStr = await B08_API_data(ServerAddress.API_B08_questionStatis, type);
+        //     Debug.Log("API_B08_questionStatis" + jsonStr);
+        //     GlobalData.B08QuestionStatis = JsonConvert.DeserializeObject<B08_questionStatis>(jsonStr);
+        // }
+        // catch (Exception e)
+        // {
+        //     Debug.LogWarning("获取API_B08_questionStatis数据不成功,原因:" + e.ToString());
+        // }
+    }
+
+    public async Task B08_GetTaskList()
+    {
+        string jsonStr;
+         try
         {
-            jsonStr = await B08_API_data(ServerAddress.API_B08_questionStatis, type);
-            Debug.Log("API_B08_questionStatis" + jsonStr);
-            GlobalData.B08QuestionStatis = JsonConvert.DeserializeObject<B08_questionStatis>(jsonStr);
+            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("获取API_B08_questionStatis数据不成功,原因:" + e.ToString());
+            Debug.LogWarning("GetToken不成功,原因:" + e.ToString());
         }
 
         try
         {
-            jsonStr = await B08_API_data(ServerAddress.API_B08_inspectType, type);
-            Debug.Log("API_B08_inspectType" + jsonStr);
-            GlobalData.B08InspectType = JsonConvert.DeserializeObject<B08_inspectType>(jsonStr);
-            GlobalData.B08TaskListInfos = new B08_TaskListInfoData[GlobalData.B08InspectType.data.Length];
-            for (int i = 0; i < GlobalData.B08InspectType.data.Length; i++)
+            jsonStr = await B08_API_TaskInfoList(1,999);
+            Debug.Log("B08_API_TaskInfoList" + jsonStr);
+            GlobalData.B08TaskListData = JsonConvert.DeserializeObject<B08_TaskListInfoData>(jsonStr);
+            //Debug.Log("GlobalData.B08TaskListData: "+GlobalData.B08TaskListData.rows.Length);
+            // GlobalData.B08TaskListInfos = new B08_TaskListInfoData[GlobalData.B08InspectType.data.Length];
+            for (int i = 0; i < GlobalData.B08TaskListData.rows.Length; i++)
             {
-                string tempResult = await B08_API_TaskInfo(type, i);
-                Debug.Log($"B08_API_TaskInfo type={i}:" + tempResult);
-                GlobalData.B08TaskListInfos[i] = JsonConvert.DeserializeObject<B08_TaskListInfoData>(tempResult);
+                string tempResult = await B08_API_TaskInfo(GlobalData.B08TaskListData.rows[i].id);
+                //Debug.Log($"B08_API_TaskInfo id={GlobalData.B08TaskListData.rows[i].id}:" + tempResult);
+                var tempInfo= JsonConvert.DeserializeObject<B08_TaskInfo>(tempResult);
+                if (tempInfo != null)
+                {
+                    GlobalData.B08TaskListData.rows[i].infoData = tempInfo.Data;
+                }
+                else
+                {
+                    Debug.Log("tempInfo null! :"+tempResult);
+                }
+                string taskLocationResult = await B08_API_TaskLocation(GlobalData.B08TaskListData.rows[i].id);
+                //Debug.Log($"taskLocationResult id={GlobalData.B08TaskListData.rows[i].id}:" + taskLocationResult);
+                GlobalData.B08TaskListData.rows[i].infoData.Locations = JsonConvert.DeserializeObject<B08_TaskLocationInfo>(taskLocationResult).data;
+
             }
         }
         catch (Exception e)
         {
-            Debug.LogWarning("获取API_B08_inspectType数据不成功,原因:" + e.ToString());
+            Debug.LogWarning("获取B08_API_TaskInfo数据不成功,原因:" + e.ToString());
         }
     }
 
+    public string token;
+    
     public async Task<string> B08_API_data(string cmdUrl, int type)
     {
         if (type == 0)
@@ -2148,27 +2178,121 @@ public class HttpHelper : MonoBehaviour
         www.Dispose();
         return result;
     }
-    public async Task<string> B08_API_TaskInfo(int type, int xunjian_type)
+    // public async Task<string> B08_API_TaskInfo(int type, int xunjian_type)
+    // {
+    //     string cmdUrl = ServerAddress.API_B08_taskInfo;
+    //     if (type == 0)
+    //     {
+    //         cmdUrl += "1794245918999351298";
+    //     }
+    //     else if (type == 1)
+    //     {
+    //         cmdUrl += "1798366756789653505";
+    //     }
+    //
+    //     cmdUrl += "&xunjian_type=" + xunjian_type;
+    //     Debug.Log("!!!:" + cmdUrl);
+    //     UnityWebRequest www = new UnityWebRequest(cmdUrl, "Get");
+    //     www.downloadHandler = new DownloadHandlerBuffer();
+    //     www.SetRequestHeader("Content-Type", "application/json");
+    //     await www.SendWebRequest();
+    //     if (www.result != UnityWebRequest.Result.Success)
+    //     {
+    //         Debug.LogWarning($"获取B08_API_TaskInfo type={type} 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+    //     }
+    //     string result = www.downloadHandler.text;
+    //     www.Dispose();
+    //     return result;
+    // }
+    
+    public async Task<string> B08_API_GetToken()
+    {
+        string cmdUrl = ServerAddress.API_GetToken;
+        Debug.Log("!!!:" + cmdUrl);
+        UnityWebRequest www = new UnityWebRequest(cmdUrl, "Post");
+        www.downloadHandler = new DownloadHandlerBuffer();
+        www.SetRequestHeader("Content-Type", "application/json");
+        await www.SendWebRequest();
+        if (www.result != UnityWebRequest.Result.Success)
+        {
+            Debug.LogWarning($"获取API_GetToken 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+        }
+        string result = www.downloadHandler.text;
+        www.Dispose();
+        return result;
+    }
+
+    
+    public async Task<string> B08_API_TaskInfoList(int page,int pageSize)
+    {
+        string cmdUrl = ServerAddress.API_B08_taskInfoList;
+        cmdUrl += $"?pageNum={page}&pageSize={pageSize}";
+        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_API_TaskInfoList page={page} pageSize={pageSize} 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+        }
+        string result = www.downloadHandler.text;
+        www.Dispose();
+        return result;
+    }
+    
+    public async Task<string> B08_API_TaskInfo(string id)
     {
         string cmdUrl = ServerAddress.API_B08_taskInfo;
-        if (type == 0)
+        cmdUrl += $"/{id}";
+        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)
         {
-            cmdUrl += "1794245918999351298";
+            Debug.LogWarning($"获取API_B08_taskInfo id={id} 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
         }
-        else if (type == 1)
+        string result = www.downloadHandler.text;
+        www.Dispose();
+        return result;
+    }
+    
+    public async Task<string> B08_API_TaskInfoItems(string id)
+    {
+        string cmdUrl = ServerAddress.API_B08_taskItems;
+        cmdUrl += $"/{id}/taskItems";
+        //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)
         {
-            cmdUrl += "1798366756789653505";
+            Debug.LogWarning($"获取B08_API_TaskInfoItems id={id} 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
         }
-
-        cmdUrl += "&xunjian_type=" + xunjian_type;
-        Debug.Log("!!!:" + cmdUrl);
+        string result = www.downloadHandler.text;
+        www.Dispose();
+        return result;
+    }
+    
+    public async Task<string> B08_API_TaskLocation(string id)
+    {
+        string cmdUrl = ServerAddress.API_B08_taskLocation;
+        cmdUrl += $"/{id}";
+        //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_API_TaskInfo type={type} 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+            Debug.LogWarning($"获取API_B08_taskLocation id={id} 数据不成功,原因:返request不成功:" + www.downloadHandler.text);
         }
         string result = www.downloadHandler.text;
         www.Dispose();

Assets/Scripts/UI/Data/GlobalData.cs

@@ -143,9 +143,10 @@ public class GlobalData
     public static B08_inspectResult B08InspectResult;
     public static B08_projectExamine B08ProjectExamine;
     public static B08_event B08Event;
-    public static B08_questionStatis B08QuestionStatis;
-    public static B08_inspectType B08InspectType;
-    public static B08_TaskListInfoData[] B08TaskListInfos;
+    //public static B08_questionStatis B08QuestionStatis;
+    //public static B08_inspectType B08InspectType;
+    public static B08_TaskListInfoData B08TaskListData;
+    //public static B08_TaskListInfoData[] B08TaskListInfos;
     public static int B08_Type = -1;
     #endregion   
     

Assets/Scripts/UI/Item/B08_TaskListItem.cs

@@ -12,8 +12,8 @@ public class B08_TaskListItem : MonoBehaviour
     public Text ctrlText;
 
     public GameObject more;
-   
-    
+
+
     public Button moreButton;
 
     public bool moreMessage = false;
@@ -27,7 +27,6 @@ public class B08_TaskListItem : MonoBehaviour
 
     public static B08_TaskListItem currentTaskListItem;
 
-    private int currentItemIndex;
     public void Init()
     {
         rect = this.GetComponent<RectTransform>();
@@ -38,17 +37,15 @@ public class B08_TaskListItem : MonoBehaviour
         ctrlText = this.transform.Find("ctrlText").GetComponent<Text>();
 
         more = this.transform.Find("more").gameObject;
-        
+
         more.SetActive(false);
-        
+
         moreButton = ctrlText.GetComponent<Button>();
-        moreButton.onClick.AddListener(() => {
-            ChangeMoreMessage(!moreMessage);
-        });
+        moreButton.onClick.AddListener(() => { ChangeMoreMessage(!moreMessage); });
 
         moreMessage = false;
         ctrlText.text = "<color=#00EFFF>详情</color>";
-        rect.sizeDelta = new Vector2(360,38);
+        rect.sizeDelta = new Vector2(360, 38);
         more.SetActive(false);
     }
 
@@ -59,14 +56,16 @@ public class B08_TaskListItem : MonoBehaviour
         {
             if (currentTaskListItem != null && currentTaskListItem != this)
             {
-                if (currentTaskListItem.moreMessage) {
+                if (currentTaskListItem.moreMessage)
+                {
                     currentTaskListItem.ChangeMoreMessage(false);
                 }
             }
+
             ctrlText.text = "<color=#00FF3F>收起</color>";
             rect.sizeDelta = new Vector2(360, 354);
             more.SetActive(true);
-            gcywLayer.SetTaskImgPanelData(InfoData.items, InfoData.startTime);
+            gcywLayer.SetTaskImgPanelData(InfoData.Locations, InfoData.createTime);
             currentTaskListItem = this;
         }
         else
@@ -74,48 +73,48 @@ public class B08_TaskListItem : MonoBehaviour
             ctrlText.text = "<color=#00EFFF>详情</color>";
             rect.sizeDelta = new Vector2(360, 38);
             more.SetActive(false);
-            
         }
-        
     }
 
-    public void SetData(GCYWLayer baseLayer,B08_TaskInfoData data,int typeIndex,int itemIndex)
+    public void SetData(GCYWLayer baseLayer, B08_TaskInfoData data)
     {
-        currentItemIndex = itemIndex;
         gcywLayer = baseLayer;
         InfoData = data;
         string typeStr = "";
-        switch (typeIndex)
+        switch (data.type)
         {
-            case 0:
+            case "0":
                 typeStr = "电气";
                 break;
-            case 1:
+            case "1":
                 typeStr = "闸站";
                 break;
-            case 2:
+            case "2":
                 typeStr = "堤防";
                 break;
-            case 3:
+            case "3":
                 typeStr = "交叉建筑";
                 break;
-            case 4:
+            case "4":
                 typeStr = "定期专项";
                 break;
         }
+
         typeText.text = typeStr;
-        titleText.text = data.fanganName;
+        titleText.text = data.title;
         stateText.text = data.status;
-        dateText.text = data.startTime;
+        dateText.text = data.createTime;
         for (int i = 0; i < PointItems.Count; i++)
         {
             Destroy(PointItems[i].gameObject);
         }
+
         PointItems.Clear();
-        for (int i = 0; i < data.items.Length; i++)
+        if (data.taskItems == null) return;
+        for (int i = 0; i < data.taskItems.Length; i++)
         {
-            B08_TaskPointItem tempItem = Instantiate(pointItemPrefab,itemContent).GetComponent<B08_TaskPointItem>();
-            tempItem.SetData(baseLayer,data.items[i],i,data.startTime);
+            B08_TaskPointItem tempItem = Instantiate(pointItemPrefab, itemContent).GetComponent<B08_TaskPointItem>();
+            tempItem.SetData(baseLayer, data.taskItems[i], i, data.createTime);
             var button = tempItem.GetComponent<ExtendedButton_PointItem>();
             button.index = i;
             button.onPointerEnter += baseLayer.SetTaskPointIconHeightLight;

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -141,9 +141,16 @@ public class ServerAddress
     public static string API_B08_questionStatis = YZTServerAddress + "/open/questionStatis?projectId=";
     //public static string API_B08_inspectType = YZTServerAddress + "/open/inspectType?projectId=";
     public static string API_B08_inspectType = YZTServerAddress + "/open/xunjianType?projectid=";
+
+    public static string API_GetToken = YZTServerAddress + "/api/quickLogin/admin";
     //拿任务详细信息
-    public static string API_B08_taskInfo = YZTServerAddress + "/open/xunjianrenwu?projectid=";
-  
+    //public static string API_B08_taskInfo = YZTServerAddress + "/open/xunjianrenwu?projectid=";
+    public static string API_B08_taskInfoList = YZTServerAddress + "/project/workOrder/list";
+    public static string API_B08_taskInfo = YZTServerAddress + "/project/workOrder";
+    public static string API_B08_taskItems = YZTServerAddress + "/project/workOrder";
+    public static string API_B08_taskLocation = YZTServerAddress + "/project/workOrder/location/workOrder";
+
+    
     /// <summary>
     /// 获取站点水位信息(折线图和信息列表)
     /// </summary>

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

@@ -15,10 +15,10 @@ public class B08_TaskPointItem : MonoBehaviour
     private GCYWLayer gcywLayer;
     private void Awake()
     {
-        imgButton.onClick.AddListener(() =>
-        {
-            gcywLayer.OpenTaskImgPanel(itemIndex);
-        });
+        // imgButton.onClick.AddListener(() =>
+        // {
+        //     gcywLayer.OpenTaskImgPanel(itemIndex);
+        // });
     }
 
     public void SetData(GCYWLayer baseLayer,B08_TaskItems data,int index,string time)
@@ -26,6 +26,6 @@ public class B08_TaskPointItem : MonoBehaviour
         gcywLayer = baseLayer;
         itemIndex = index;
         posAndtimeText.text = $"{(index==0?"起点":"")}  <color=#A5BFE2>{time}</color>";
-        messageText.text = $"{data.faItemName}";
+        messageText.text = $"{data.itemDescription}";
     }
 }

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

@@ -16,9 +16,9 @@ public class GCYWLayer : YZTRootLayer
     private Text _dangRiGongChengText;
     private Text _zhengChangYunXingText;
 
-    private Text _zhengGaiWenTi_Count_Text;
-    private Text _zhengGaiWenTi_Vlaue_Text;
-    private MPImage _zhengGaiWenTi_Slider;
+    // private Text _zhengGaiWenTi_Count_Text;
+    // private Text _zhengGaiWenTi_Vlaue_Text;
+    // private MPImage _zhengGaiWenTi_Slider;
 
     private Text _tuFaShiJian_Count_Text;
     private Text _tuFaShiJian_Vlaue_Text;
@@ -39,26 +39,26 @@ public class GCYWLayer : YZTRootLayer
     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 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 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;
@@ -75,20 +75,17 @@ public class GCYWLayer : YZTRootLayer
     private CanvasGroup button_CG1;
     private CanvasGroup button_CG2;
 
-    [FormerlySerializedAs("TaskListPanel")]
-    public GameObject TaskListPanelObj;
-
     public TaskListPanel taskListPanel;
 
-    public GameObject taskPhotoPanelObj;
-    public TaskPhotoPanel taskPhotoPanel;
+    //public GameObject taskPhotoPanelObj;
+    //public TaskPhotoPanel taskPhotoPanel;
 
     public GameObject taskPointIconPrefab;
     public Transform taskPointIconContent;
     public List<TaskPointIcon> taskPointIcons = new List<TaskPointIcon>();
     public LineRenderer taskPointLineRenderer;
 
-    public Button closePanelBtn;
+    //public Button closePanelBtn;
 
     private void Awake()
     {
@@ -104,9 +101,9 @@ public class GCYWLayer : YZTRootLayer
         _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>();
+        // _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>();
@@ -126,29 +123,29 @@ public class GCYWLayer : YZTRootLayer
         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));
+        // 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>();
@@ -162,17 +159,17 @@ public class GCYWLayer : YZTRootLayer
         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();
-        });
+        // 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)
@@ -194,11 +191,14 @@ public class GCYWLayer : YZTRootLayer
         SetXunJianBarChart();
         SetGongChengGuanLiChart();
         SetTFSJ_Data();
-        SetWTZG_Data();
-        SetXJLE_Data();
+
+        await HttpHelper._Instance.B08_GetTaskList();
+        taskListPanel.SetData(this);
+        //SetWTZG_Data();
+        //SetXJLE_Data();
         
-        TaskListPanelObj.SetActive(false);
-        taskPhotoPanelObj.SetActive(false);
+        //TaskListPanelObj.SetActive(false);
+        //taskPhotoPanelObj.SetActive(false);
     }
 
     private async void OnEnable()
@@ -313,43 +313,43 @@ 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 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()
@@ -360,20 +360,20 @@ public class GCYWLayer : YZTRootLayer
         checkPathButtonText.text = $"巡检路线({textStr})";
     }
 
-    public void OpenTaskListPanel(int type)
-    {
-        taskListPanel.SetData(this,type);
-        TaskListPanelObj.SetActive(true);
-    }
+    // public void OpenTaskListPanel(int type)
+    // {
+    //     taskListPanel.SetData(this,type);
+    //     TaskListPanelObj.SetActive(true);
+    // }
 
-    private B08_TaskItems[] currentTaskItems;
+    private B08_TaskLocation[] currentTaskLocation;
     private string taskTime;
     
-    public void SetTaskImgPanelData(B08_TaskItems[] itemsArray,string _time)
+    public void SetTaskImgPanelData(B08_TaskLocation[] itemsArray,string _time)
     {
-        currentTaskItems = itemsArray;
+        currentTaskLocation = itemsArray;
         taskTime = _time;
-        taskPhotoPanel.SetData(currentTaskItems[0],taskTime);
+        //taskPhotoPanel.SetData(currentTaskItems[0],taskTime);
         taskPointLineRenderer.positionCount = 0;
         for (int i = 0; i < taskPointIcons.Count; i++)
         {
@@ -386,7 +386,7 @@ public class GCYWLayer : YZTRootLayer
             if (itemsArray[i].longitude != null && itemsArray[i].latitude != null)
             {
                 GameObject tempObj = Instantiate(taskPointIconPrefab, taskPointIconContent);
-                tempObj.name = itemsArray[i].xjItemId;
+                tempObj.name = itemsArray[i].locationTypeName;
 
                 Vector2 longlatt = CoordinateConverter.GCJ02ToWGS84(double.Parse(itemsArray[i].longitude),
                     double.Parse(itemsArray[i].latitude));
@@ -432,10 +432,10 @@ public class GCYWLayer : YZTRootLayer
         }
     }
 
-    public void OpenTaskImgPanel(int openPage)
-    {
-        taskPhotoPanel.SetData(currentTaskItems[openPage],taskTime);
-        taskPhotoPanel.ChangePage(0);
-        taskPhotoPanelObj.SetActive(true);
-    }
+    // public void OpenTaskImgPanel(int openPage)
+    // {
+    //     taskPhotoPanel.SetData(currentTaskItems[openPage],taskTime);
+    //     taskPhotoPanel.ChangePage(0);
+    //     taskPhotoPanelObj.SetActive(true);
+    // }
 }

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

@@ -13,7 +13,8 @@ public class TaskListPanel : MonoBehaviour
     public Button taskTpye_jianZhuButton;
     public Button taskTpye_zhuanXiangButton;
 
-
+    public InputField inputField;
+    
     public GameObject taskItemPrefab;
 
     public Transform itemContent;
@@ -22,27 +23,60 @@ public class TaskListPanel : MonoBehaviour
 
     public GCYWLayer gcywLayer;
 
+    public B08_TaskListData[] taskInfoList;
+    
     private void Awake()
     {
+        taskTpye_allButton.onClick.AddListener(()=>SetType("-1"));
+        taskTpye_dianQiButton.onClick.AddListener(()=>SetType("0"));
+        taskTpye_zhaZhanButton.onClick.AddListener(()=>SetType("1"));
+        taskTpye_diFangButton.onClick.AddListener(()=>SetType("2"));
+        taskTpye_jianZhuButton.onClick.AddListener(()=>SetType("3"));
+        taskTpye_zhuanXiangButton.onClick.AddListener(()=>SetType("4"));
+        
+        inputField.onValueChanged.AddListener(Search);
     }
 
-    public void SetData(GCYWLayer baseLayer, int type)
+    public void Search(string inputStr)
+    {
+        for (int i = 0; i < taskItemList.Count; i++)
+        {
+            taskItemList[i].gameObject.SetActive(taskItemList[i].InfoData.title.Contains(inputStr));
+        }
+    }
+    
+    public void SetType(string type)
+    {
+        if (type.Equals("-1"))
+        {
+            for (int i = 0; i < taskItemList.Count; i++)
+            {
+                taskItemList[i].gameObject.SetActive(true);
+            }
+            return;
+        }
+        for (int i = 0; i < taskItemList.Count; i++)
+        {
+            taskItemList[i].gameObject.SetActive(taskItemList[i].InfoData.type.Equals(type));
+        }
+    }
+
+    public void SetData(GCYWLayer baseLayer)
     {
         gcywLayer = baseLayer;
         for (int i = 0; i < taskItemList.Count; i++)
         {
             Destroy(taskItemList[i].gameObject);
         }
-
         taskItemList.Clear();
-        var taskInfoList = GlobalData.B08TaskListInfos[type].data;
+        taskInfoList = GlobalData.B08TaskListData.rows;
         if (taskInfoList != null)
         {
             for (int j = 0; j < taskInfoList.Length; j++)
             {
                 B08_TaskListItem tempItem = Instantiate(taskItemPrefab, itemContent).GetComponent<B08_TaskListItem>();
                 tempItem.Init();
-                tempItem.SetData(gcywLayer, taskInfoList[j], type,j);
+                tempItem.SetData(gcywLayer, taskInfoList[j].infoData);
                 taskItemList.Add(tempItem);
             }
         }

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

@@ -6,75 +6,75 @@ using UnityEngine.UI;
 
 public class TaskPhotoPanel : MonoBehaviour
 {
-    public RawImage img;
-    public Text posText;
-    public Text messageText;
-    public Text pageText;
-    public Button lastItem;
-    public Button nextItem;
-
-    public B08_TaskItems task_item;
-    public int currentIndex = 0;
-
-    public Text dateText;
-    public string _timeInfo;
-
-    private void Awake()
-    {
-        lastItem.onClick.AddListener(Last);
-        nextItem.onClick.AddListener(Next);
-    }
-
-    public void SetData(B08_TaskItems item, string _time)
-    {
-        currentIndex = 0;
-        task_item = item;
-        _timeInfo = _time;
-        
-        posText.text = task_item.faItemName;
-        messageText.text = task_item.remark == null? "暂无内容": task_item.remark;
-        dateText.text = task_item.finishedTime == null?_timeInfo: task_item.finishedTime;
-
-        ChangePage(currentIndex);
-    }
-
-    public void Next()
-    {
-        if (task_item is { files: not null } && currentIndex < task_item.files.Length - 1)
-        {
-            currentIndex++;
-            ChangePage(currentIndex);
-        }
-    }
-
-    public void Last()
-    {
-        if (task_item is { files: not null } &&currentIndex > 0)
-        {
-            currentIndex--;
-            ChangePage(currentIndex);
-        }
-    }
-
-    public void ChangePage(int pageIndex)
-    {
-        img.texture = null;
-        if (task_item?.files == null || task_item.files.Length < 1)
-        {
-            pageText.text = $"0/0";
-            return;
-        }
-        var currentData = task_item.files[pageIndex];
-        if (currentData.filePath!=null&&!currentData.filePath.Equals(""))
-        {
-            string path = "http://58.19.230.46:9180/prod-api/uploads/" + currentData.filePath;
-            TextureLoadHelp._Instance.LoadTexFromUrl(path, img);
-        }
-        else {
-            img.texture = null;
-        }
-        //Debug.Log(currentData.faItemName + " " + currentData.startTime + " " + currentData.finishedTime);
-       
-        pageText.text = $"{pageIndex + 1}/{task_item.files.Length}";
-    }
+    // public RawImage img;
+    // public Text posText;
+    // public Text messageText;
+    // public Text pageText;
+    // public Button lastItem;
+    // public Button nextItem;
+    //
+    // public B08_TaskItems task_item;
+    // public int currentIndex = 0;
+    //
+    // public Text dateText;
+    // public string _timeInfo;
+    //
+    // private void Awake()
+    // {
+    //     lastItem.onClick.AddListener(Last);
+    //     nextItem.onClick.AddListener(Next);
+    // }
+    //
+    // public void SetData(B08_TaskItems item, string _time)
+    // {
+    //     currentIndex = 0;
+    //     task_item = item;
+    //     _timeInfo = _time;
+    //     
+    //     posText.text = task_item.faItemName;
+    //     messageText.text = task_item.itemDescription == null? "暂无内容": task_item.itemDescription;
+    //     dateText.text = task_item.finishedTime == null?_timeInfo: task_item.finishedTime;
+    //
+    //     ChangePage(currentIndex);
+    // }
+    //
+    // public void Next()
+    // {
+    //     if (task_item is { files: not null } && currentIndex < task_item.files.Length - 1)
+    //     {
+    //         currentIndex++;
+    //         ChangePage(currentIndex);
+    //     }
+    // }
+    //
+    // public void Last()
+    // {
+    //     if (task_item is { files: not null } &&currentIndex > 0)
+    //     {
+    //         currentIndex--;
+    //         ChangePage(currentIndex);
+    //     }
+    // }
+    //
+    // public void ChangePage(int pageIndex)
+    // {
+    //     img.texture = null;
+    //     if (task_item?.files == null || task_item.files.Length < 1)
+    //     {
+    //         pageText.text = $"0/0";
+    //         return;
+    //     }
+    //     var currentData = task_item.files[pageIndex];
+    //     if (currentData.filePath!=null&&!currentData.filePath.Equals(""))
+    //     {
+    //         string path = "http://58.19.230.46:9180/prod-api/uploads/" + currentData.filePath;
+    //         TextureLoadHelp._Instance.LoadTexFromUrl(path, img);
+    //     }
+    //     else {
+    //         img.texture = null;
+    //     }
+    //     //Debug.Log(currentData.faItemName + " " + currentData.startTime + " " + currentData.finishedTime);
+    //    
+    //     pageText.text = $"{pageIndex + 1}/{task_item.files.Length}";
+    // }
 }