free-sun
/
Inspection
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

(*)巡检记录问题处理 展示设备信息

master
peng.peng 2 years ago
parent
6c9d7a6478
commit
3e4ed721a2
2 changed files with 168 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
  2. 77
      web/client/src/sections/patrolManage/containers/patrolRecord.js

32
web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
View File

@ -70,28 +70,37 @@ export default (props) => {
<div className="item-title">{"问题详情"}</div> <div className="item-title">{"问题详情"}</div>
<Row> <Row>
<Col span={6}> <Col span={12}>
<Form.Item label="点位名称：" {...formItemLayout}> <Form.Item label="点位名称：" {...formItemLayout}>
<Input value={editData?.points?.itemData?.name} readOnly /> <Input value={editData?.points?.itemData?.name} readOnly />
</Form.Item> </Form.Item>
</Col> </Col>
</Row>
<Col span={18}> <Row>
<Col span={24}>
{ {
editData?.points?.inspectContent && Object.keys(editData?.points?.inspectContent).map(key => { editData?.points?.inspectContent && editData?.points?.inspectContent.map(s => {
if (editData?.points?.inspectContent[key]?.isNormal == false) { 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 }}> return <Row style={{ marginBottom: 15 }}>
<Col span={12}> <Col span={12}>
<Form.Item label="检查项：" {...formItemLayout}> <Form.Item label="检查项：" {...formItemLayout}>
<Input value={key} readOnly /> <Input value={k.name} readOnly />
</Form.Item> </Form.Item>
<Form.Item label="异常等级：" {...formItemLayout}> <Form.Item label="异常等级：" {...formItemLayout}>
<Input value={editData?.points?.inspectContent[key]?.level} readOnly /> <Input value={k?.level} readOnly />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={12}> <Col span={12}>
<Form.Item label="问题描述：" {...formItemLayout}> <Form.Item label="问题描述：" {...formItemLayout}>
<Input value={editData?.points?.inspectContent[key]?.msgInp} readOnly title={222} /> <Input value={k?.msgInp} readOnly title={222} />
</Form.Item> </Form.Item>
<Form.Item label="现场图片：" {...formItemLayout}> <Form.Item label="现场图片：" {...formItemLayout}>
@ -106,7 +115,7 @@ export default (props) => {
defaultValue={ defaultValue={
(() => { (() => {
let nextV = [] let nextV = []
for (let s of (editData?.points?.inspectContent[key].imgs || [])) { for (let s of (k.imgs || [])) {
if (s) { if (s) {
nextV.push({ nextV.push({
storageUrl: s storageUrl: s
@ -121,6 +130,11 @@ export default (props) => {
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>
})
}
</>
} }
}) })
} }

77
web/client/src/sections/patrolManage/containers/patrolRecord.js
View File

@ -207,22 +207,83 @@ const PatrolRecord = (props) => {
} }
}) })
if (modelData && modelData.points && modelData.points.inspectContent) { if (modelData && modelData.points && modelData.points.inspectContent) {
if (modelData?.points?.itemData?.pointDevices?.length > 0) {
let inspectContent = modelData.points.inspectContent let inspectContent = modelData.points.inspectContent
for (let k in inspectContent) { inspectContent?.map(s => {
dataArr.push( dataArr.push(
<> <>
<Row> <Row>
<Col span={5} style={{}}>{k} ：</Col> <Col span={5} style={{}}>{s?.deviceName} ：</Col>
<Col span={19}> <Col span={19}>
{ {
inspectContent[k].isNormal ? '正常' : !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 }}> <Collapse ghost style={{ padding: 0 }}>
<Panel header="异常" key="1" style={{ padding: 0 }}> <Panel header="异常" key="1" style={{ padding: 0 }}>
<Row> <Row>
<Col span={4} style={{}}>巡查详情 ：</Col> <Col span={4} style={{}}>巡查详情 ：</Col>
<Col span={20}>{inspectContent[k].msgInp}</Col> <Col span={20}>{k.msgInp}</Col>
<Col span={4} style={{}}>严重等级 ：</Col> <Col span={4} style={{}}>严重等级 ：</Col>
<Col span={20}>{inspectContent[k].level}</Col> <Col span={20}>{k.level}</Col>
<Col span={4} style={{}}>现场照片 ：</Col> <Col span={4} style={{}}>现场照片 ：</Col>
<Col span={20}> <Col span={20}>
<Uploads <Uploads
@ -236,7 +297,7 @@ const PatrolRecord = (props) => {
defaultValue={ defaultValue={
(() => { (() => {
let nextV = [] let nextV = []
for (let s of (inspectContent[k].imgs || [])) { for (let s of (k.imgs || [])) {
if (s) { if (s) {
nextV.push({ nextV.push({
storageUrl: s storageUrl: s
@ -256,7 +317,11 @@ const PatrolRecord = (props) => {
</Row> </Row>
</> </>
) )
})
}
} }
} }
return dataArr return dataArr
})()} })()}

Write Preview
Loading…
Cancel
Save