diff --git a/src/assets/img/record1.png b/src/assets/img/record1.png new file mode 100644 index 0000000..b86dede Binary files /dev/null and b/src/assets/img/record1.png differ diff --git a/src/assets/img/record2.png b/src/assets/img/record2.png new file mode 100644 index 0000000..603ef22 Binary files /dev/null and b/src/assets/img/record2.png differ diff --git a/src/assets/img/record3.png b/src/assets/img/record3.png new file mode 100644 index 0000000..a326931 Binary files /dev/null and b/src/assets/img/record3.png differ diff --git a/src/pages/inspectiontasks/InspectionTask.less b/src/pages/inspectiontasks/InspectionTask.less index 31042b4..2530686 100644 --- a/src/pages/inspectiontasks/InspectionTask.less +++ b/src/pages/inspectiontasks/InspectionTask.less @@ -14,6 +14,9 @@ :global(.ant-table-thead > tr > th){ background-color:#F0F7F7; } + //:global(.ant-picker,.ant-input){ + // border:1px solid #2C9E9D !important; + //} } *{ font-size:16px diff --git a/src/pages/inspectiontasks/InspectionTasks.js b/src/pages/inspectiontasks/InspectionTasks.js index f8ba7ea..806d81b 100644 --- a/src/pages/inspectiontasks/InspectionTasks.js +++ b/src/pages/inspectiontasks/InspectionTasks.js @@ -57,8 +57,15 @@ const InspectionTasks = () => { activeBarHeight:0 }, Select:{ - activeBorderColor:'#2C9E9D' - } + activeBorderColor:'#2C9E9D', + colorBorder:'#2C9E9D' + }, + Input:{ + colorBorder:'#2C9E9D' + }, + DatePicker:{ + colorBorder:'#2C9E9D' + }, }, }; const onChange=()=>{ diff --git a/src/pages/inspectiontasks/components/Inspectionrecords/inspectionRecords.js b/src/pages/inspectiontasks/components/Inspectionrecords/inspectionRecords.js index 9d4c6de..df7a737 100644 --- a/src/pages/inspectiontasks/components/Inspectionrecords/inspectionRecords.js +++ b/src/pages/inspectiontasks/components/Inspectionrecords/inspectionRecords.js @@ -2,7 +2,7 @@ import styles from './inspectionRecords.less' import titleBg from '@/assets/img/recordTitleBg.png' import {useEffect, useRef, useState} from "react"; -import {Button, Col, DatePicker, Drawer, Input, Menu, Row, Select, Table} from "antd"; +import {Button, Col, DatePicker, Drawer, Input, Menu, Row, Select, Table, Tag} from "antd"; import {MenuBg, TablePagination} from "@/pages/inspectiontasks/components/Inspectiontaskplan/InspectionTaskPlan"; import {DownOutlined, SearchOutlined, UndoOutlined} from "@ant-design/icons"; import {Title} from "@/pages/inspectiontasks/InspectionTasks"; @@ -10,9 +10,77 @@ import * as echarts from 'echarts'; import btnImg1 from '@/assets/img/planBtn1.png' import btnImg2 from '@/assets/img/planBtn2.png' import btnImg3 from '@/assets/img/planBtn3.png' - +import record1 from '@/assets/img/record1.png' +import record2 from '@/assets/img/record2.png' +import record3 from '@/assets/img/record3.png' const Drawers=(props)=>{ + const columns = [ + { + title: '设备名称', + dataIndex: 'deviceName', + key: 'deviceName', + // width: 200, + }, + { + title: '关注指标', + dataIndex: 'metric', + key: 'metric', + // width: 150, + }, + { + title: '指标值', + dataIndex: 'value', + key: 'value', + // width: 120, + render: (value) => {value}, + }, + { + title: '状态', + dataIndex: 'status', + key: 'status', + width: 70, + render: (status) => ( + + {status} + + ), + }, + { + title: '备注', + dataIndex: 'remark', + key: 'remark', + width:140, + ellipsis: true, + }, + ]; + // 数据源 + const dataSource = [ + { + key: '1', + deviceName: '1# 储油罐', + metric: '液位高度', + value: '10.5m', + status: '正常', + remark: '无泄漏', + }, + { + key: '2', + deviceName: '输油主泵', + metric: '出口压力', + value: '0.6MPa', + status: '正常', + remark: '振动值<3mm/s', + }, + { + key: '3', + deviceName: '中控室 DCS 系统', + metric: '信号冗余度', + value: '99%', + status: '正常', + remark: '双路供电稳定', + }, + ]; console.log(props.row) return( { closable={{'aria-label': 'Close Button'}} open={props.open} onClose={props.onClose} - width={500} + width={522} className={styles['customDrawer']} > @@ -52,16 +120,121 @@ const Drawers=(props)=>{ -