diff --git a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
index 94c5762..ad15fa0 100644
--- a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
+++ b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
@@ -70,57 +70,71 @@ export default (props) => {
{"问题详情"}
-
+
-
-
+
+
+
{
- editData?.points?.inspectContent && Object.keys(editData?.points?.inspectContent).map(key => {
- if (editData?.points?.inspectContent[key]?.isNormal == false) {
- return
-
-
-
-
-
-
-
-
-
-
-
+ editData?.points?.inspectContent && editData?.points?.inspectContent.map(s => {
+ if (s?.alarm == true) {
+ return <>
+ {s?.deviceName &&
+
+
+ }
+ {
+ s?.checkItems?.map(k => {
+ return
+
+
+
+
+
+
+
+
+
+
+
+
-
- {
- let nextV = []
- for (let s of (editData?.points?.inspectContent[key].imgs || [])) {
- if (s) {
- nextV.push({
- storageUrl: s
- })
+
+ {
+ let nextV = []
+ for (let s of (k.imgs || [])) {
+ if (s) {
+ nextV.push({
+ storageUrl: s
+ })
+ }
+ }
+ return nextV
+ })()
}
- }
- return nextV
- })()
- }
- />
+ />
+
+
+
+
+ })
+ }
+
+
-
-
-
}
})
}
diff --git a/web/client/src/sections/patrolManage/containers/patrolRecord.js b/web/client/src/sections/patrolManage/containers/patrolRecord.js
index 6fb7668..dedaf8b 100644
--- a/web/client/src/sections/patrolManage/containers/patrolRecord.js
+++ b/web/client/src/sections/patrolManage/containers/patrolRecord.js
@@ -207,56 +207,121 @@ const PatrolRecord = (props) => {
}
})
if (modelData && modelData.points && modelData.points.inspectContent) {
- let inspectContent = modelData.points.inspectContent
- for (let k in inspectContent) {
- dataArr.push(
- <>
-
- {k} ：
-
- {
- inspectContent[k].isNormal ? '正常' :
-
-
-
- 巡查详情 ：
- {inspectContent[k].msgInp}
- 严重等级 ：
- {inspectContent[k].level}
- 现场照片 ：
-
- {
- let nextV = []
- for (let s of (inspectContent[k].imgs || [])) {
- if (s) {
- nextV.push({
- storageUrl: s
- })
+ if (modelData?.points?.itemData?.pointDevices?.length > 0) {
+ let inspectContent = modelData.points.inspectContent
+ inspectContent?.map(s => {
+ dataArr.push(
+ <>
+
+ {s?.deviceName} ：
+
+ {
+ !s.alarm ? '正常' :
+
+
+ {s?.checkItems?.map(k => {
+ return <>
+ {k.name}:
+
+ 巡查详情 ：
+ {k.msgInp}
+ 严重等级 ：
+ {k.level}
+ 现场照片 ：
+
+ {
+ let nextV = []
+ for (let s of (k.imgs || [])) {
+ if (s) {
+ nextV.push({
+ storageUrl: s
+ })
+ }
+ }
+ return nextV
+ })()
}
+ />
+
+
+
+
+ })}
+
+
+
+ }
+
+
+
+ )
+ })
+
+ } else {
+ let inspectContent = modelData.points.inspectContent
+ for (let v in inspectContent) {
+ inspectContent[v]?.checkItems?.map(k => {
+ dataArr.push(
+ <>
+
+ {k?.name} ：
+
+ {
+ !inspectContent[v].alarm ? '正常' :
+
+
+
+ 巡查详情 ：
+ {k.msgInp}
+ 严重等级 ：
+ {k.level}
+ 现场照片 ：
+
+ {
+ let nextV = []
+ for (let s of (k.imgs || [])) {
+ if (s) {
+ nextV.push({
+ storageUrl: s
+ })
+ }
+ }
+ return nextV
+ })()
}
- return nextV
- })()
- }
- />
-
-
-
-
- }
-
-
-
- )
+ />
+
+
+
+
+ }
+
+
+
+ )
+ })
+
+ }
}
+
}
return dataArr
})()}