From 3e4ed721a2886f3a108aa4e53904c42fc527d3b8 Mon Sep 17 00:00:00 2001
From: "peng.peng" <peng.peng@free-sun.com.cn>
Date: Fri, 20 Oct 2023 10:53:13 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E5=B7=A1=E6=A3=80=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/isuue-handle-mdal.js           |  98 ++++++-----
 .../patrolManage/containers/patrolRecord.js   | 159 ++++++++++++------
 2 files changed, 168 insertions(+), 89 deletions(-)

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) => {
 
             <div className="item-title">{"问题详情"}</div>
             <Row>
-                <Col span={6}>
+                <Col span={12}>
                     <Form.Item label="点位名称：" {...formItemLayout}>
                         <Input value={editData?.points?.itemData?.name} readOnly />
                     </Form.Item>
                 </Col>
-
-                <Col span={18}>
+            </Row>
+            <Row>
+                <Col span={24}>
                     {
-                        editData?.points?.inspectContent && Object.keys(editData?.points?.inspectContent).map(key => {
-                            if (editData?.points?.inspectContent[key]?.isNormal == false) {
-                                return <Row style={{ marginBottom: 15 }}>
-                                    <Col span={12}>
-                                        <Form.Item label="检查项：" {...formItemLayout}>
-                                            <Input value={key} readOnly />
-                                        </Form.Item>
-                                        <Form.Item label="异常等级：" {...formItemLayout}>
-                                            <Input value={editData?.points?.inspectContent[key]?.level} readOnly />
-                                        </Form.Item>
-                                    </Col>
-                                    <Col span={12}>
-                                        <Form.Item label="问题描述：" {...formItemLayout}>
-                                            <Input value={editData?.points?.inspectContent[key]?.msgInp} readOnly title={222} />
+                        editData?.points?.inspectContent && editData?.points?.inspectContent.map(s => {
+                            if (s?.alarm == true) {
+                                return <>
+                                    {s?.deviceName && <Col span={12}>
+                                        <Form.Item label="设备名称：" {...formItemLayout}>
+                                            <Input value={s?.deviceName} readOnly />
                                         </Form.Item>
+                                    </Col>}
+                                    {
+                                        s?.checkItems?.map(k => {
+                                            return <Row style={{ marginBottom: 15 }}>
+                                                <Col span={12}>
+                                                    <Form.Item label="检查项：" {...formItemLayout}>
+                                                        <Input value={k.name} readOnly />
+                                                    </Form.Item>
+                                                    <Form.Item label="异常等级：" {...formItemLayout}>
+                                                        <Input value={k?.level} readOnly />
+                                                    </Form.Item>
+                                                </Col>
+                                                <Col span={12}>
+                                                    <Form.Item label="问题描述：" {...formItemLayout}>
+                                                        <Input value={k?.msgInp} readOnly title={222} />
+                                                    </Form.Item>
 
-                                        <Form.Item label="现场图片：" {...formItemLayout}>
-                                            <Uploads
-                                                listType='picture-card'
-                                                uploadType='project'
-                                                maxFilesNum={1}
-                                                maxFileSize={10}
-                                                isQiniu={true}
-                                                disabled={true}
-                                                fileTypes={["png", "jpg"]}
-                                                defaultValue={
-                                                    (() => {
-                                                        let nextV = []
-                                                        for (let s of (editData?.points?.inspectContent[key].imgs || [])) {
-                                                            if (s) {
-                                                                nextV.push({
-                                                                    storageUrl: s
-                                                                })
+                                                    <Form.Item label="现场图片：" {...formItemLayout}>
+                                                        <Uploads
+                                                            listType='picture-card'
+                                                            uploadType='project'
+                                                            maxFilesNum={1}
+                                                            maxFileSize={10}
+                                                            isQiniu={true}
+                                                            disabled={true}
+                                                            fileTypes={["png", "jpg"]}
+                                                            defaultValue={
+                                                                (() => {
+                                                                    let nextV = []
+                                                                    for (let s of (k.imgs || [])) {
+                                                                        if (s) {
+                                                                            nextV.push({
+                                                                                storageUrl: s
+                                                                            })
+                                                                        }
+                                                                    }
+                                                                    return nextV
+                                                                })()
                                                             }
-                                                        }
-                                                        return nextV
-                                                    })()
-                                                }
-                                            />
+                                                        />
+
+                                                    </Form.Item>
+                                                </Col>
+                                            </Row>
+                                        })
+                                    }
+                                </>
+
 
-                                        </Form.Item>
-                                    </Col>
-                                </Row>
                             }
                         })
                     }
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(
-                                <>
-                                    <Row>
-                                        <Col span={5} style={{}}>{k} ：</Col>
-                                        <Col span={19}>
-                                            {
-                                                inspectContent[k].isNormal ? '正常' :
-                                                    <Collapse ghost style={{ padding: 0 }}>
-                                                        <Panel header="异常" key="1" style={{ padding: 0 }}>
-                                                            <Row>
-                                                                <Col span={4} style={{}}>巡查详情 ：</Col>
-                                                                <Col span={20}>{inspectContent[k].msgInp}</Col>
-                                                                <Col span={4} style={{}}>严重等级 ：</Col>
-                                                                <Col span={20}>{inspectContent[k].level}</Col>
-                                                                <Col span={4} style={{}}>现场照片 ：</Col>
-                                                                <Col span={20}>
-                                                                    <Uploads
-                                                                        listType='picture-card'
-                                                                        uploadType='project'
-                                                                        maxFilesNum={1}
-                                                                        maxFileSize={10}
-                                                                        isQiniu={true}
-                                                                        disabled={true}
-                                                                        fileTypes={["png", "jpg"]}
-                                                                        defaultValue={
-                                                                            (() => {
-                                                                                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(
+                                    <>
+                                        <Row>
+                                            <Col span={5} style={{}}>{s?.deviceName} ：</Col>
+                                            <Col span={19}>
+                                                {
+                                                    !s.alarm ? '正常' :
+                                                        <Collapse ghost style={{ padding: 0 }}>
+                                                            <Panel header="异常" key="1" style={{ padding: 0 }}>
+                                                                {s?.checkItems?.map(k => {
+                                                                    return <>
+                                                                        <Row style={{ fontWeight: 'bold' }}>{k.name}:</Row>
+                                                                        <Row style={{ marginBottom: 20 }}>
+                                                                            <Col span={4} style={{}}>巡查详情 ：</Col>
+                                                                            <Col span={20}>{k.msgInp}</Col>
+                                                                            <Col span={4} style={{}}>严重等级 ：</Col>
+                                                                            <Col span={20}>{k.level}</Col>
+                                                                            <Col span={4} style={{}}>现场照片 ：</Col>
+                                                                            <Col span={20}>
+                                                                                <Uploads
+                                                                                    listType='picture-card'
+                                                                                    uploadType='project'
+                                                                                    maxFilesNum={1}
+                                                                                    maxFileSize={10}
+                                                                                    isQiniu={true}
+                                                                                    disabled={true}
+                                                                                    fileTypes={["png", "jpg"]}
+                                                                                    defaultValue={
+                                                                                        (() => {
+                                                                                            let nextV = []
+                                                                                            for (let s of (k.imgs || [])) {
+                                                                                                if (s) {
+                                                                                                    nextV.push({
+                                                                                                        storageUrl: s
+                                                                                                    })
+                                                                                                }
+                                                                                            }
+                                                                                            return nextV
+                                                                                        })()
                                                                                     }
+                                                                                />
+                                                                            </Col>
+                                                                        </Row>
+                                                                    </>
+
+                                                                })}
+
+                                                            </Panel>
+                                                        </Collapse>
+                                                }
+                                            </Col>
+                                        </Row>
+                                    </>
+                                )
+                            })
+
+                        } else {
+                            let inspectContent = modelData.points.inspectContent
+                            for (let v in inspectContent) {
+                                inspectContent[v]?.checkItems?.map(k => {
+                                    dataArr.push(
+                                        <>
+                                            <Row>
+                                                <Col span={5} style={{}}>{k?.name} ：</Col>
+                                                <Col span={19}>
+                                                    {
+                                                        !inspectContent[v].alarm ? '正常' :
+                                                            <Collapse ghost style={{ padding: 0 }}>
+                                                                <Panel header="异常" key="1" style={{ padding: 0 }}>
+                                                                    <Row>
+                                                                        <Col span={4} style={{}}>巡查详情 ：</Col>
+                                                                        <Col span={20}>{k.msgInp}</Col>
+                                                                        <Col span={4} style={{}}>严重等级 ：</Col>
+                                                                        <Col span={20}>{k.level}</Col>
+                                                                        <Col span={4} style={{}}>现场照片 ：</Col>
+                                                                        <Col span={20}>
+                                                                            <Uploads
+                                                                                listType='picture-card'
+                                                                                uploadType='project'
+                                                                                maxFilesNum={1}
+                                                                                maxFileSize={10}
+                                                                                isQiniu={true}
+                                                                                disabled={true}
+                                                                                fileTypes={["png", "jpg"]}
+                                                                                defaultValue={
+                                                                                    (() => {
+                                                                                        let nextV = []
+                                                                                        for (let s of (k.imgs || [])) {
+                                                                                            if (s) {
+                                                                                                nextV.push({
+                                                                                                    storageUrl: s
+                                                                                                })
+                                                                                            }
+                                                                                        }
+                                                                                        return nextV
+                                                                                    })()
                                                                                 }
-                                                                                return nextV
-                                                                            })()
-                                                                        }
-                                                                    />
-                                                                </Col>
-                                                            </Row>
-                                                        </Panel>
-                                                    </Collapse>
-                                            }
-                                        </Col>
-                                    </Row>
-                                </>
-                            )
+                                                                            />
+                                                                        </Col>
+                                                                    </Row>
+                                                                </Panel>
+                                                            </Collapse>
+                                                    }
+                                                </Col>
+                                            </Row>
+                                        </>
+                                    )
+                                })
+
+                            }
                         }
+
                     }
                     return dataArr
                 })()}