-
- {' '}
-
-
-
- {' '}
- 项目名称
-
-
-
- 上报时间
- {timeHandler(e)}} onClear={()=>{setStartTime('1970-1-1');setEndTime('2099-12-31')}}>
-
-
-
-
+ return (
+
+
+
+ {' '}
+
+
+
+ {' '}
+ 项目名称
+
+
+
+ 上报时间
+ { timeHandler(e) }} onClear={() => { setStartTime('1970-1-1'); setEndTime('2099-12-31') }}>
-
-
- 共{total}条信息
-
-
{
- //console.log('pageIndex1',pageIndex,pageSize)
- setPageIndex(pageIndex)
- setPageSize(pageSize)
- const query={
- pageIndex,pageSize,msg:'获取维护记录',startTime, endTime,projectId
- }
- getEquipment(query)
- }}>
+
+
+
+
+ 共{total}条信息
+
+
{
+ //console.log('pageIndex1',pageIndex,pageSize)
+ setPageIndex(pageIndex)
+ setPageSize(pageSize)
+ const query = {
+ pageIndex, pageSize, msg: '获取维护记录', startTime, endTime, projectId
+ }
+ getEquipment(query)
+ }}>
+
+
{
+ setAddVis(false);
+ setRecordRow(null);
+ //getEquipment();
+ findHandler()
+ }}
+ recordRow={recordRow}
+ pepList={pepList}
+ projectList={projectList}
+ >
-
{
- setAddVis(false);
- setRecordRow(null);
- //getEquipment();
- findHandler()
- }}
- recordRow={recordRow}
- pepList={pepList}
- projectList={projectList}
- >
-
- );
+ );
};
-function mapStateToProps(state) {
- const { auth, global, members, webSocket, ProjectPoms } = state;
- return {
- // loading: members.isRequesting,
- // user: auth.user,
- actions: global.actions,
- // members: members.data,
- // socket: webSocket.socket
- projectList: ProjectPoms.data?.rows
- };
+function mapStateToProps (state) {
+ const { auth, global, members, webSocket, ProjectPoms } = state;
+ return {
+ // loading: members.isRequesting,
+ // user: auth.user,
+ actions: global.actions,
+ // members: members.data,
+ // socket: webSocket.socket
+ projectList: ProjectPoms.data?.rows
+ };
}
export default connect(mapStateToProps)(MaintenanceRecords);
diff --git a/web/client/src/sections/service/containers/serviceRecord.jsx b/web/client/src/sections/service/containers/serviceRecord.jsx
index 3003912..7217bef 100644
--- a/web/client/src/sections/service/containers/serviceRecord.jsx
+++ b/web/client/src/sections/service/containers/serviceRecord.jsx
@@ -1,248 +1,362 @@
'use strict';
-import React, { useEffect,useState,useMemo } from 'react';
-import { Calendar,DatePicker,RadioGroup, Radio,Button,Table,Modal,Tooltip,Pagination, Popconfirm } from '@douyinfe/semi-ui';
+import React, { useEffect, useState, useMemo } from 'react';
+import { Calendar, DatePicker, RadioGroup, Radio, Button, Table, Modal, Tooltip, Pagination, Popconfirm } from '@douyinfe/semi-ui';
import moment from 'moment'
import { connect } from 'react-redux';
import RecordModal from '../components/recordModal'
+import PlanAddmodal from '../components/planAddmodal'
const Server = (props) => {
const { dispatch, actions, user, loading, socket } = props
//console.log('actions',actions)
- const {install,service}=actions
- const [dateValue,setDateValue]=useState([])
- const [mode,setMode]=useState('month')
- const [modalVis,setModalVis]=useState(false)
- const [recordRow,setRecordRow]=useState(null)
- const [recordList,setRecordList]=useState([])
+ const { install, service } = actions
+ const [dateValue, setDateValue] = useState([])
+ const [mode, setMode] = useState('month')
+ const [modalVis, setModalVis] = useState(false)
+ const [recordRow, setRecordRow] = useState(null)
+ const [recordList, setRecordList] = useState([])
const [pepList, setPepList] = useState([])//角色分配
- const [startTime,setStartTime]=useState('1970-1-1' )
- const [endTime,setEndTime]=useState('2099-1-1')
- const [sTime,setStime]=useState(moment().startOf('month').format('YYYY-MM-DD HH:mm:ss'))
- const [eTime,setEtime]=useState(moment().endOf('month').format('YYYY-MM-DD HH:mm:ss'))
- const [calculability,setCalculability]=useState('')
- const [pageSize,setPageSize]=useState(10)
- const [pageIndex,setPageIndex]=useState(1)
- const [total,setTotal]=useState()
- const getRecordList=(query={
- startTime,endTime,pageIndex,pageSize
- })=>{
- dispatch(service.getRecord(query)).then((res)=>{
- console.log('res1',res)
+ const [startTime, setStartTime] = useState('1970-1-1')
+ const [endTime, setEndTime] = useState('2099-1-1')
+ const [sTime, setStime] = useState(moment().startOf('month').format('YYYY-MM-DD HH:mm:ss'))
+ const [eTime, setEtime] = useState(moment().endOf('month').format('YYYY-MM-DD HH:mm:ss'))
+ const [calculability, setCalculability] = useState('')
+ const [pageSize, setPageSize] = useState(10)
+ const [pageIndex, setPageIndex] = useState(1)
+ const [total, setTotal] = useState()
+ const [addVis, setAddVis] = useState(false)
+ const [cycPlan, setCysPlan] = useState([])
+ const [visible, setVisible] = useState(false)
+
+
+ const getRecordList = (query = {
+ startTime, endTime, pageIndex, pageSize
+ }) => {
+ dispatch(service.getRecord(query)).then((res) => {
+ // console.log('res1',res)
setRecordList(res?.payload.data.res)
setTotal(res?.payload.data.count)
})
}
- //('endTime',endTime)
+ //('endTime',endTime)
useEffect(() => {
getRecordList()
dispatch(install.getOrganizationDeps()).then((res) => {//获取项企(PEP)全部部门及其下用户
- if(res.success) setPepList(res.payload.data)
- })
+ if (res.success) setPepList(res.payload.data)
+ })
+
}, [])
- const delHandler=(id)=>{
- dispatch(service.delRecord(id)).then((res)=>{
- if(res.success) {
- getRecordList({startTime,endTime,pageIndex:1,pageSize})
+ const delHandler = (id) => {
+ dispatch(service.delRecord(id)).then((res) => {
+ if (res.success) {
+ getRecordList({ startTime, endTime, pageIndex: 1, pageSize })
setPageIndex(1)
}
})
}
+
+ const getCycPlan = (recordId) => {
+ dispatch(service.getMaintenancePlan({ type: 'period', msg: '获取周期性计划', recordId: recordId })).then((res) => {
+ setCysPlan(res?.payload.data.responseRes)
+ })
+ }
useEffect(() => {
- const query={
+ const query = {
sTime, eTime
- }
- console.log('sTime',sTime,eTime)
- dispatch(service.calculability(query)).then((res)=>{
- if(res.success) setCalculability((Math.round(res.payload.data * 10000)) / 100 + '%'); // console.log(res.payload.data,'dateee')
+ }
+ console.log('sTime', sTime, eTime)
+ dispatch(service.calculability(query)).then((res) => {
+ if (res.success) setCalculability((Math.round(res.payload.data * 10000)) / 100 + '%'); // console.log(res.payload.data,'dateee')
})
- }, [sTime,eTime])
+ }, [sTime, eTime])
+
+ const pagination = {
- const pagination={
-
- }
+ }
//console.log(recordList,'11111111')
- const columns = [
- {
- title: '序号',
- render:(t, r, i) => {
- return i + 1
- }
- },
- {
- title: '故障描述',
- dataIndex: 'sketch',
- },
- {
- title: '发生时间',
- render:(record)=>{
+ const columns = [
+ {
+ title: '序号',
+ render: (t, r, i) => {
+ return i + 1
+ }
+ },
+ {
+ title: '故障描述',
+ dataIndex: 'sketch',
+ },
+ {
+ title: '发生时间',
+ render: (record) => {
return
{moment(record.occurrenceTime).format('YYYY-MM-DD HH:mm:ss')}
- },
- },
- {
- title: '解决时间',
- render:(record)=>{
- return
{moment(record.solvingTime).format('YYYY-MM-DD HH:mm:ss')}
- },
- },
- {
- title: '恢复时间',
- render:(record)=>{
- const tdd=parseInt((moment(record.solvingTime).format('x')-moment(record.occurrenceTime).format('x'))/1000/60/60/24)//取整天
- const tdh=parseInt((moment(record.solvingTime).format('x')-moment(record.occurrenceTime).format('x'))/1000/60/60%24)//取整时
- const tds=parseInt((moment(record.solvingTime).format('x')-moment(record.occurrenceTime).format('x'))/1000/60%60)//取整分
- return
{`${tdd}天${tdh}时${tds}分`}
- }
- },
- {
+ },
+ },
+ {
+ title: '解决时间',
+ render: (record) => {
+ return
{moment(record.solvingTime).format('YYYY-MM-DD HH:mm:ss')}
+ },
+ },
+ {
+ title: '恢复时间',
+ render: (record) => {
+ const tdd = parseInt((moment(record.solvingTime).format('x') - moment(record.occurrenceTime).format('x')) / 1000 / 60 / 60 / 24)//取整天
+ const tdh = parseInt((moment(record.solvingTime).format('x') - moment(record.occurrenceTime).format('x')) / 1000 / 60 / 60 % 24)//取整时
+ const tds = parseInt((moment(record.solvingTime).format('x') - moment(record.occurrenceTime).format('x')) / 1000 / 60 % 60)//取整分
+ return
{`${tdd}天${tdh}时${tds}分`}
+ }
+ },
+ {
title: '故障类型',
dataIndex: 'type',
- },
- {
- title: '解决者',
- //width:20,
- render:(record)=>{
- // console.log('ressss',record)
- return
- {record?.maintenanceRecordExecuteUsers.map((item)=>{
- return item.name
- }).toString()
- }
+ },
+ {
+ title: '解决者',
+ //width:20,
+ render: (record) => {
+ // console.log('ressss',record)
+ return
+ {record?.maintenanceRecordExecuteUsers.map((item) => {
+ return item.name
+ }).toString()
+ }
-
- }
- },
- {
- title: '操作',
- render:(record)=>{
- return
-
-
{
- delHandler(record.id);
- }}
- >
-
-
-
+ }
+ },
+ {
+ title: '文件',
+ render: (record) => {
+ return record.files?.length > 0 &&
{
+ return
+
+
{
+ delHandler(record.id);
+ }}
+ >
+
+
+
+
+ {record.planList?.length > 0 &&
}
+
-
-
-
系统可用性
-
-
onSelect(e)} value={mode} type="button">
- 本月
- 全年
-
-
onChangeDate(e) }
- density="compact"
- style={{ width: 400 }}
- value={dateValue}
- onClear={()=>{clearHandler()}}
+
+
+
+
系统可用性
+
+ onSelect(e)} value={mode} type="button">
+ 本月
+ 全年
+
+ onChangeDate(e)}
+ density="compact"
+ style={{ width: 400 }}
+ value={dateValue}
+ onClear={() => { clearHandler() }}
/>
-
-
- {`系统可用性=（平均故障间隔MTBF）/(平均故障间隔MTBF+故障恢复时间MTTR）*100%`}
- {calculability}
-
-
+
+
+ {`系统可用性=（平均故障间隔MTBF）/(平均故障间隔MTBF+故障恢复时间MTTR）*100%`}
+ {calculability}
+
+
-
+
产生时间
- {
- setStartTime((e[0])+'');setEndTime(e[1]+'') }}
- onClear={()=>{setStartTime('1970-1-1');setEndTime('2099-12-31')}} />
-
-
-
-
{
+
+
+
{
return {
- background:'#000000',
+ background: '#000000',
}
- }}/>
+ }} />
-
-
- 共{total}条信息
-
-
{
- setPageIndex(pageIndex)
- setPageSize(pageSize)
- const query={
- startTime,endTime,pageIndex,pageSize
- }
- getRecordList(query)
- }}>
-
+
+ 共{total}条信息
+
+
{
+ setPageIndex(pageIndex)
+ setPageSize(pageSize)
+ const query = {
+ startTime, endTime, pageIndex, pageSize
+ }
+ getRecordList(query)
+ }}>
{
+ return {
+ background: '#000000',
+ }
+ }} />
+
+
+
)
}
@@ -251,7 +365,7 @@ function mapStateToProps (state) {
return {
// loading: members.isRequesting,
// user: auth.user,
- actions: global.actions,
+ actions: global.actions,
// members: members.data,
// socket: webSocket.socket
};
diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js
index 6a1428a..60f33ec 100644
--- a/web/client/src/utils/webapi.js
+++ b/web/client/src/utils/webapi.js
@@ -129,7 +129,10 @@ export const ApiTable = {
//获取设备类型
getEquipmentCategory: 'equipmentCategory',
//获取状态数据
- getMaintenanceStatus: 'maintenanceStatus'
+ getMaintenanceStatus: 'maintenanceStatus',
+
+
+ respondRecord: 'respond-record',
};
// 项企的接口