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

(*) 检查项web完善

master
liujiangyong 2 years ago
parent
a3061e5ef6
commit
c4e2067d1a
4 changed files with 166 additions and 178 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. 10
      api/app/lib/controllers/patrolManage/checkItems.js
  2. 56
      web/client/src/sections/patrolManage/components/checkItemsModal.js
  3. 270
      web/client/src/sections/patrolManage/containers/checkItems.js
  4. 8
      web/client/src/utils/webapi.js

10
api/app/lib/controllers/patrolManage/checkItems.js
View File

@ -25,9 +25,9 @@ async function createGroup(ctx, next) {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
try { try {
const data = ctx.request.body; const data = ctx.request.body;
await models.CheckItemsGroup.create(data) const rslt = await models.CheckItemsGroup.create(data);
ctx.status = 204; ctx.status = 200;
ctx.body = { message: '新建分组成功' } ctx.body = { message: '新建分组成功', groupId: rslt.dataValues.id }
} catch (error) { } catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400; ctx.status = 400;
@ -92,9 +92,7 @@ async function updateCheckItems(ctx, next) {
const data = ctx.request.body; const data = ctx.request.body;
const { id } = ctx.params; const { id } = ctx.params;
await models.CheckItems.update({ await models.CheckItems.update(data, {
name: data.name,
}, {
where: { where: {
id: id id: id
} }

56
web/client/src/sections/patrolManage/components/checkItemsModal.js
View File

@ -1,34 +1,27 @@
import { Button, Form, Input, Modal, Select } from 'antd'; import { Button, Form, Input, Modal, Select } from 'antd';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { getUserList, getProjectList, positionList } from '../actions/plan';
import { getCheckItemsGroup } from '../actions/checkItems'; import { getCheckItemsGroup } from '../actions/checkItems';
import moment from 'moment'; import moment from 'moment';
const CheckItemsModal = ({ visible, onCreate, onCancel, dispatch, type, curRecord }) => { const CheckItemsModal = ({ visible, onOk, onCancel, curRecord, dispatch }) => {
const [pointOpt, setPointOpt] = useState(); const [group, setGroup] = useState([]);
const [points, setPoints] = useState();
const [isNewGroup, setIsNewGroup] = useState(false); const [isNewGroup, setIsNewGroup] = useState(false);
const [form] = Form.useForm(); const [form] = Form.useForm();
useEffect(() => { useEffect(() => {
dispatch(getCheckItemsGroup()); dispatch(getCheckItemsGroup()).then(res => {
if (type === 'create') { if (res.success) {
dispatch(getUserList()) const opt = res.payload.data?.map(g => ({ value: g.id, label: g.name }));
} else { setGroup(opt);
dispatch(positionList({ projectId: curRecord?.project?.id })).then(res => { }
if (res.success) { });
setPoints(res.payload.data?.rows)
setPointOpt(res.payload.data?.rows[0]?.points?.map(p => ({ label: p.name, value: p.id })))
}
})
}
}, []) }, [])
return ( return (
<Modal <Modal
visible={visible} visible={visible}
title="新增巡检计划" title={curRecord ? "检查项修改" : "检查项添加"}
okText="确定" okText="确定"
cancelText="取消" cancelText="取消"
onCancel={() => { onCancel={() => {
@ -36,22 +29,15 @@ const CheckItemsModal = ({ visible, onCreate, onCancel, dispatch, type, curRecor
onCancel(); onCancel();
}} }}
onOk={() => { onOk={() => {
if (type === 'view') {
form.resetFields();
onCancel();
return;
}
form form
.validateFields() .validateFields()
.then((values) => { .then((values) => {
form.resetFields(); form.resetFields();
const params = { const params = {
...values, ...values,
startTime: values.time[0], isNewGroup
endTime: values.time[1],
points: points[0]?.points?.filter(p => values?.points?.includes(p.id))
} }
onCreate(params); onOk(params);
}) })
.catch((info) => { .catch((info) => {
console.log('Validate Failed:', info); console.log('Validate Failed:', info);
@ -64,10 +50,8 @@ const CheckItemsModal = ({ visible, onCreate, onCancel, dispatch, type, curRecor
name="form_in_modal" name="form_in_modal"
initialValues={{ initialValues={{
...curRecord, ...curRecord,
points: curRecord?.points?.map(p => p.id),
userDept: curRecord?.user?.department?.name, userDept: curRecord?.user?.department?.name,
}} }}
disabled={type === 'view'}
> >
<Form.Item <Form.Item
name="name" name="name"
@ -79,34 +63,30 @@ const CheckItemsModal = ({ visible, onCreate, onCancel, dispatch, type, curRecor
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="groupName" name="group"
label="分组名称" label="分组名称"
rules={[ rules={[
{ required: true, message: '请选择分组' }, { required: true, message: '请选择分组' },
]} ]}
> >
{ {
isNewGroup ? isNewGroup
<Select options={pointOpt} disabled={!pointOpt || type === 'view'} /> : ? <Input />
<Input /> : <Select options={group} loading={!group?.length} />
} }
</Form.Item> </Form.Item>
</Form> </Form>
<Button type='link' onClick={() => { <Button type='link' onClick={() => {
setIsNewGroup(!isNewGroup); setIsNewGroup(!isNewGroup);
}}>创建分组</Button> }}>{isNewGroup ? '选择已有' : '创建分组'}</Button>
</Modal > </Modal >
); );
}; };
function mapStateToProps(state) { function mapStateToProps(state) {
const { auth, userList, structureList } = state const { auth } = state
return { return {
user: auth.user, user: auth.user,
userList: userList.data || [],
structureList: structureList.data || [],
userLoading: userList.isRequesting,
struLoading: structureList.isRequesting
} }
} }
export default connect(mapStateToProps)(CheckItemsModal); export default connect(mapStateToProps)(CheckItemsModal);

270
web/client/src/sections/patrolManage/containers/checkItems.js
View File

@ -4,143 +4,153 @@ import { Button, Popconfirm } from 'antd';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import CheckItemsModal from '../components/checkItemsModal'; import CheckItemsModal from '../components/checkItemsModal';
import { createPatrolPlan, delPatrolPlan, updatePatrolPlan } from '../actions/plan'; import { createPatrolPlan, delPatrolPlan, updatePatrolPlan } from '../actions/plan';
import { getCheckItems } from '../actions/checkItems'; import { getCheckItems, createCheckItems, updateCheckItems, createCheckItemsGroup } from '../actions/checkItems';
import moment from 'moment';
function CheckItems(props) { function CheckItems(props) {
const { dispatch, user } = props; const { dispatch, user } = props;
const tableRef = useRef(); const tableRef = useRef();
const [dataSource, setDataSource] = useState([{}]); const [dataSource, setDataSource] = useState([{}]);
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [type, setType] = useState(); const [curRecord, setCurRecord] = useState(null); // 新增 or 修改
const [curRecord, setCurRecord] = useState(); const [select, setSelect] = useState([]);
const [select, setSelect] = useState([]);
const onCreate = (values) => { const onOk = async (values) => {
if (type === 'create') { let groupId = null;
dispatch(createPatrolPlan(values)).then(res => { if (values.isNewGroup) {
if (res.success) { await dispatch(createCheckItemsGroup({ name: values.group })).then(res => {
tableRef.current.reload(); if (res.success) {
} groupId = res.payload.data?.groupId
}) }
} else { })
dispatch(updatePatrolPlan({ ...values, id: curRecord.id })).then(res => { }
if (res.success) { if (!curRecord) {
tableRef.current.reload(); dispatch(createCheckItems({
} name: values.name,
}) groupId: groupId ? groupId : values.group
} })).then(res => {
setVisible(false); if (res.success) {
}; tableRef.current.reload();
}
})
} else {
dispatch(updateCheckItems(curRecord.id, {
name: values.name,
groupId: groupId ? groupId : values.group
})).then(res => {
if (res.success) {
tableRef.current.reload();
}
})
}
setVisible(false);
};
const columns = [{ const columns = [{
title: '检查项', title: '检查项',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
ellipsis: true, ellipsis: true,
width: 150, width: 150,
}, { }, {
title: '分组名称', title: '分组名称',
dataIndex: 'groupName', dataIndex: 'groupName',
key: 'groupName', key: 'groupName',
ellipsis: true, ellipsis: true,
search: false, search: false,
width: 150, width: 150,
render: (_, record) => { render: (_, record) => {
return <div>{record?.check_items_group?.name}</div> return <div>{record?.check_items_group?.name}</div>
} }
}, { }, {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
key: 'action', key: 'action',
search: false, search: false,
width: 200, width: 200,
render: (_, record) => { render: (_, record) => {
return <> return <>
<Button type="link" onClick={() => { <Button type="link" onClick={() => {
setType('edit') setCurRecord(record)
setCurRecord(record) setVisible(true)
setVisible(true) }}>修改</Button>
}}>修改</Button> <Popconfirm
<Popconfirm title="确认删除？"
title="确认删除？" onConfirm={() => {
onConfirm={() => { dispatch(delPatrolPlan(record.id)).then(res => {
dispatch(delPatrolPlan(record.id)).then(res => { if (res.success) {
if (res.success) { tableRef.current.reload();
tableRef.current.reload(); }
} })
}) }}>
}}> <Button type="link" danger>删除</Button>
<Button type="link" danger>删除</Button> </Popconfirm>
</Popconfirm> </>
</> },
}, }];
}];
return ( return (
<> <>
<ProTable <ProTable
columns={columns} columns={columns}
actionRef={tableRef} actionRef={tableRef}
options={false} options={false}
dataSource={dataSource || []} dataSource={dataSource || []}
rowKey='id' rowKey='id'
pagination={{ pageSize: 10 }} pagination={{ pageSize: 10 }}
request={async (params = {}) => { request={async (params = {}) => {
const res = await dispatch(getCheckItems(params)); const res = await dispatch(getCheckItems(params));
setDataSource(res?.payload.data?.rows); setDataSource(res?.payload.data?.rows);
return { ...res }; return { ...res };
}} }}
onReset={() => { }} onReset={() => { }}
search={{ search={{
defaultCollapsed: false, defaultCollapsed: false,
optionRender: (searchConfig, formProps, dom) => [ optionRender: (searchConfig, formProps, dom) => [
...dom.reverse(), ...dom.reverse(),
<Button <Button
key="add" key="add"
type='primary' type='primary'
onClick={() => { onClick={() => {
setType('create') setCurRecord(null)
setVisible(true) setVisible(true)
}} }}
>新增</Button>, >新增</Button>,
<Button <Button
key="del" key="del"
type='primary' type='primary'
onClick={() => { onClick={() => {
const values = searchConfig?.form?.getFieldsValue(); // const values = searchConfig?.form?.getFieldsValue();
console.log(values); // console.log(values);
}} }}
>批量删除</Button>, >批量删除</Button>,
], ],
}} }}
rowSelection={{ rowSelection={{
selectedRowKeys: select?.map(v => v.id) || [], selectedRowKeys: select?.map(v => v.id) || [],
onChange: (selectedRowKeys, selectedRows) => { onChange: (_, selectedRows) => {
setSelect(selectedRows) setSelect(selectedRows)
} }
}} }}
/> />
{ {
visible ? visible ?
<CheckItemsModal <CheckItemsModal
visible={visible} visible={visible}
onCreate={onCreate} onOk={onOk}
type={type} curRecord={curRecord}
curRecord={curRecord} onCancel={() => {
onCancel={() => { setVisible(false);
setVisible(false); }}
}} /> : null
/> : null }
} </>
</> )
)
} }
function mapStateToProps(state) { function mapStateToProps(state) {
const { auth } = state const { auth } = state
return { return {
user: auth.user user: auth.user
} }
} }
export default connect(mapStateToProps)(CheckItems); export default connect(mapStateToProps)(CheckItems);

8
web/client/src/utils/webapi.js
View File

@ -31,10 +31,10 @@ export const ApiTable = {
patrolRecord: 'patrolRecord/:patrolPlanId/:startTime/:endTime/:alarm/:pointId', patrolRecord: 'patrolRecord/:patrolPlanId/:startTime/:endTime/:alarm/:pointId',
// 检查项设定 // 检查项设定
checkItems: '/checkItems', // 获取/新增 checkItems: 'checkItems', // 获取/新增
updateCheckItems: '/checkItems/{id}', updateCheckItems: 'checkItems/{id}',
delCheckItems: '/checkItems/{ids}', delCheckItems: 'checkItems/{ids}',
checkItemsGroup: '/checkItems/group', // 获取/新增 checkItemsGroup: 'checkItems/group', // 获取/新增
// 用户权限 // 用户权限
getResource: 'resource', getResource: 'resource',

Write Preview
Loading…
Cancel
Save