diff --git a/web/client/src/sections/auth/containers/login.js b/web/client/src/sections/auth/containers/login.js
index 8f6ea32..59a3c1c 100644
--- a/web/client/src/sections/auth/containers/login.js
+++ b/web/client/src/sections/auth/containers/login.js
@@ -6,256 +6,144 @@ import SHA1 from 'crypto-js/sha1';
import Hex from 'crypto-js/enc-hex';
import { ApiTable } from '$utils'
import { Request } from '@peace/utils'
-import { Button, Input, Form, Row, Col, message, Tabs } from 'antd';
+import { Button, Input, Form, Row, Col, message, Tabs, Tooltip } from 'antd';
import { login, LOGIN_ERROR } from '../actions/auth';
import { ExclamationCircleOutlined } from '@ant-design/icons';
import { Uploads } from '$components'
+import { LockOutlined, UserOutlined } from '@ant-design/icons';
import '../style.less';
const FormItem = Form.Item;
let codCountDownInterval = null
const Login = props => {
- const { dispatch, user, error, isRequesting } = props
- const [username, setUserName] = useState('')
- const [password, setPassword] = useState('')
- const [phone, setPhone] = useState('')
- const [code, setCode] = useState('')
- const [inputChanged, setInputChanged] = useState(false)
- const [curTabKey, setCurTabKey] = useState(1)
- const [codSending, setCodSending] = useState(false)
- const [codCountDown, setCodeCountDown] = useState(60)
- const codCountDownRef = useRef(0)
+ const { dispatch, user, error, isRequesting } = props
+ const [username, setUserName] = useState('')
+ const [password, setPassword] = useState('')
+ const [phone, setPhone] = useState('')
+ const [code, setCode] = useState('')
+ const [inputChanged, setInputChanged] = useState(false)
+ const [curTabKey, setCurTabKey] = useState(1)
+ const [codSending, setCodSending] = useState(false)
+ const [codCountDown, setCodeCountDown] = useState(60)
+ const codCountDownRef = useRef(0)
+ const [form] = Form.useForm();
+ useEffect(() => {
- useEffect(() => {
+ }, [])
- }, [])
+ useEffect(() => {
+ if (user && user.authorized) {
+ dispatch(push('/projectRegime/information'));
+ }
+ }, [user])
- useEffect(() => {
- if (user && user.authorized) {
- dispatch(push('/projectRegime/information'));
- }
- }, [user])
-
- useEffect(() => {
- if (codSending) {
- setCodeCountDown(59)
- codCountDownRef.current = 59
- codCountDownInterval = setInterval(() => {
- codCountDownRef.current -= 1
- if (codCountDownRef.current == 0) {
- setCodSending(false)
- setCodeCountDown(60)
- clearInterval(codCountDownInterval)
- codCountDownInterval = null
- } else {
- setCodeCountDown(codCountDownRef.current)
- }
- }, 1000);
- } else {
- if (codCountDownInterval) {
- clearInterval(codCountDownInterval)
- codCountDownInterval = null
- setCodeCountDown(60)
+ useEffect(() => {
+ if (codSending) {
+ setCodeCountDown(59)
+ codCountDownRef.current = 59
+ codCountDownInterval = setInterval(() => {
+ codCountDownRef.current -= 1
+ if (codCountDownRef.current == 0) {
+ setCodSending(false)
+ setCodeCountDown(60)
+ clearInterval(codCountDownInterval)
+ codCountDownInterval = null
+ } else {
+ setCodeCountDown(codCountDownRef.current)
}
- }
- }, [codSending])
+ }, 1000);
+ } else {
+ if (codCountDownInterval) {
+ clearInterval(codCountDownInterval)
+ codCountDownInterval = null
+ setCodeCountDown(60)
+ }
+ }
+ }, [codSending])
+
+
+
+ return (
+
+ {/*
*/}
- const doLogin = () => {
- if (curTabKey == 1) {
- if (!username || !password)
- dispatch({
- type: LOGIN_ERROR,
- payload: { error: '请输入账号名和密码' }
- });
- setInputChanged(false)
- dispatch(login({ username, password }));
- } else {
- if (!phone || !code)
- dispatch({
- type: LOGIN_ERROR,
- payload: { error: '请输入手机号和验证码' }
- });
- dispatch(login({ phone, code }));
- }
- }
+
+
+
- const enterHandler = e => {
- if (e.key === 'Enter') {
- doLogin()
- }
- };
+
- return (
-
-
-
-
-
- 
-
-
-
-
- 中鼎国际工程项目指挥调度系统
-
-
{
- setCurTabKey(k)
- }}>
-
-
-
-
-
-
-
-
- {
- inputChanged || !error ?
- - :
-
- {error}
-
- }
-
-
-
-
- );
+
+
+
+ );
}
function mapStateToProps (state) {
- const { auth } = state;
- console.log(auth.error);
- return {
- user: auth.user,
- error: auth.error,
- isRequesting: auth.isRequesting
- }
+ const { auth } = state;
+ console.log(auth.error);
+ return {
+ user: auth.user,
+ error: auth.error,
+ isRequesting: auth.isRequesting
+ }
}
export default connect(mapStateToProps)(Login);
\ No newline at end of file
diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js
index 9c3eeec..10f59b1 100644
--- a/web/client/src/sections/organization/containers/user.js
+++ b/web/client/src/sections/organization/containers/user.js
@@ -9,9 +9,10 @@ import ResetPwd from '../components/resetPwd';
import DeptModal from '../components/deptModal';
const TreeNode = Tree.TreeNode;
-const user = JSON.parse(sessionStorage.getItem('user'));
const UserManage = (props) => {
+ const user = JSON.parse(sessionStorage.getItem('user'));
+
const { dispatch, loading, depMessage, depUser, clientHeight } = props;
// 部门
const [deptModalVisible, setDeptModalVisible] = useState(false);
diff --git a/web/client/src/sections/patrolManage/actions/plan.js b/web/client/src/sections/patrolManage/actions/plan.js
index cf3d5f8..6b94bca 100644
--- a/web/client/src/sections/patrolManage/actions/plan.js
+++ b/web/client/src/sections/patrolManage/actions/plan.js
@@ -43,4 +43,38 @@ export function updatePatrolPlan(data) {
url: ApiTable.patrolPlan,
msg: { error: '修改巡检计划失败' },
});
+}
+
+export function getUserList() {
+ return dispatch => basicAction({
+ type: 'get',
+ dispatch: dispatch,
+ actionType: 'GET_USER_LIST',
+ url: ApiTable.getDepUser.replace('{depId}', null),
+ msg: { error: '获取人员列表失败' },
+ reducer: { name: 'userList' }
+ });
+}
+
+export function getProjectList(query) {
+ return (dispatch) => basicAction({
+ type: 'get',
+ query,
+ dispatch,
+ actionType: 'GET_PROJEECT_LIST',
+ url: ApiTable.getProjectList,
+ msg: { error: '获取结构物列表失败', },
+ reducer: { name: 'structureList' }
+ });
+}
+
+export function positionList(query) {
+ return (dispatch) => basicAction({
+ type: 'get',
+ query,
+ dispatch,
+ actionType: 'POSITION_LIST',
+ url: ApiTable.position,
+ msg: { error: '获取点位列表失败', },
+ });
}
\ No newline at end of file
diff --git a/web/client/src/sections/patrolManage/components/planModal.js b/web/client/src/sections/patrolManage/components/planModal.js
new file mode 100644
index 0000000..67f4e96
--- /dev/null
+++ b/web/client/src/sections/patrolManage/components/planModal.js
@@ -0,0 +1,202 @@
+import { Button, Form, Input, Modal, Select, DatePicker } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { connect } from 'react-redux';
+import { getUserList, getProjectList, positionList } from '../actions/plan';
+import moment from 'moment';
+
+const { RangePicker } = DatePicker;
+
+const PlanModal = ({ visible, onCreate, onCancel, dispatch, userLoading, userList, structureList, struLoading, type, curRecord }) => {
+ const [userOpt, setUserOpt] = useState();
+ const [struOpt, setStruOpt] = useState();
+ const [pointOpt, setPointOpt] = useState();
+ const [points, setPoints] = useState();
+ const [unit, setUnit] = useState('次/天');
+ const [form] = Form.useForm();
+
+ useEffect(() => {
+ if (type === 'view') {
+
+ } else {
+ dispatch(getUserList())
+ dispatch(getProjectList())
+ }
+ if (type === 'edit') {
+ 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 })))
+ }
+ })
+ }
+ }, [])
+
+ useEffect(() => {
+ if (userList.length) {
+ setUserOpt(userList.map(u => ({ label: u.name, value: u.id })))
+ }
+ }, [userList])
+
+ useEffect(() => {
+ if (structureList?.rows?.length) {
+ setStruOpt(structureList?.rows?.map(s => ({ label: s.name, value: s.id })))
+ }
+ }, [structureList])
+
+ const selectAfter = (
+
+ );
+ return (
+
{
+ form.resetFields();
+ onCancel();
+ }}
+ onOk={() => {
+ if (type === 'view') {
+ form.resetFields();
+ onCancel();
+ return;
+ }
+ form
+ .validateFields()
+ .then((values) => {
+ form.resetFields();
+ const params = {
+ ...values,
+ frequency: values.frequency + unit,
+ startTime: values.time[0],
+ endTime: values.time[1],
+ points: points[0]?.points?.filter(p => values?.points?.includes(p.id))
+ }
+ onCreate(params);
+ })
+ .catch((info) => {
+ console.log('Validate Failed:', info);
+ });
+ }}
+ >
+
+
+ );
+};
+
+function mapStateToProps(state) {
+ const { auth, userList, structureList } = state
+ return {
+ user: auth.user,
+ userList: userList.data || [],
+ structureList: structureList.data || [],
+ userLoading: userList.isRequesting,
+ struLoading: structureList.isRequesting
+ }
+}
+export default connect(mapStateToProps)(PlanModal);
\ No newline at end of file
diff --git a/web/client/src/sections/patrolManage/components/userModal.js b/web/client/src/sections/patrolManage/components/userModal.js
deleted file mode 100644
index f527e73..0000000
--- a/web/client/src/sections/patrolManage/components/userModal.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { Button, Form, Input, Modal } from 'antd';
-import React, { useState } from 'react';
-
-const UserModal = ({ visible, onCreate, onCancel }) => {
- const [form] = Form.useForm();
- const reg_tel = /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
- return (
-
{
- form.resetFields();
- onCancel();
- }}
- onOk={() => {
- form
- .validateFields()
- .then((values) => {
- form.resetFields();
- onCreate(values);
- })
- .catch((info) => {
- console.log('Validate Failed:', info);
- });
- }}
- >
-
-
- );
-};
-
-export default UserModal;
\ No newline at end of file
diff --git a/web/client/src/sections/patrolManage/containers/patrolPlan.js b/web/client/src/sections/patrolManage/containers/patrolPlan.js
index 2c20320..fc8ef24 100644
--- a/web/client/src/sections/patrolManage/containers/patrolPlan.js
+++ b/web/client/src/sections/patrolManage/containers/patrolPlan.js
@@ -2,30 +2,43 @@ import React, { useState, useRef } from 'react';
import { connect } from 'react-redux';
import { Button, Popconfirm } from 'antd';
import ProTable from '@ant-design/pro-table';
-import UserModal from '../components/userModal';
+import PlanModal from '../components/planModal';
import { createPatrolPlan, delPatrolPlan, updatePatrolPlan, getPatrolPlan } from '../actions/plan';
+import moment from 'moment';
function PatrolPlan(props) {
const { dispatch, user } = props;
const tableRef = useRef();
const [dataSource, setDataSource] = useState([{}]);
const [visible, setVisible] = useState(false);
+ const [type, setType] = useState();
+ const [curRecord, setCurRecord] = useState();
const onCreate = (values) => {
- console.log(values, 'values')
- // dispatch(createEarthquakeUser(values)).then(res => {
- // if (res.success) {
- // tableRef.current.reload();
- // }
- // })
- // setVisible(false);
+ if (type === 'create') {
+ dispatch(createPatrolPlan(values)).then(res => {
+ if (res.success) {
+ tableRef.current.reload();
+ }
+ })
+ } else {
+ dispatch(updatePatrolPlan({ ...values, id: curRecord.id })).then(res => {
+ if (res.success) {
+ tableRef.current.reload();
+ }
+ })
+ }
+ setVisible(false);
};
const columns = [{
title: '结构物名称',
dataIndex: 'struName',
key: 'struName',
- ellipsis: true
+ ellipsis: true,
+ render: (_, record) => {
+ return
{record?.project?.name}
+ }
}, {
title: '巡检任务名称',
dataIndex: 'name',
@@ -36,11 +49,14 @@ function PatrolPlan(props) {
dataIndex: 'startTime',
key: 'startTime',
ellipsis: true,
+ render: (_, record) => moment(record.startTime).format('YYYY-MM-DD')
}, {
title: '结束时间',
dataIndex: 'endTime',
key: 'endTime',
ellipsis: true,
+ render: (_, record) => moment(record.endTime).format('YYYY-MM-DD')
+
}, {
title: '巡检频次',
dataIndex: 'frequency',
@@ -51,12 +67,13 @@ function PatrolPlan(props) {
dataIndex: 'patrolPoints',
key: 'patrolPoints',
ellipsis: true,
+ render: (_, record) =>
{record?.points?.length ? record?.points?.map(p => p.name).join() : '-'}
}, {
title: '巡检人',
dataIndex: 'patrolPerson',
key: 'patrolPerson',
ellipsis: true,
- render: (_, record) =>
+ render: (_, record) =>
{record?.user?.name}
}, {
title: '巡检次数统计',
dataIndex: 'patrolCount',
@@ -69,8 +86,16 @@ function PatrolPlan(props) {
search: false,
render: (_, record) => {
return <>
-
-
+
+
{
@@ -98,7 +123,6 @@ function PatrolPlan(props) {
search={false}
request={async (params = {}) => {
const res = await dispatch(getPatrolPlan(params));
- console.log(res, 'res')
setDataSource(res?.payload.data?.rows);
return { ...res };
}}
@@ -107,17 +131,25 @@ function PatrolPlan(props) {
]}
/>
- {
- setVisible(false);
- }}
- />
+ {
+ visible ?
+ {
+ setVisible(false);
+ }}
+ /> : null
+ }
)
}
diff --git a/web/client/src/sections/projectRegime/actions/projectSituation.js b/web/client/src/sections/projectRegime/actions/projectSituation.js
index 46fc366..ab045b8 100644
--- a/web/client/src/sections/projectRegime/actions/projectSituation.js
+++ b/web/client/src/sections/projectRegime/actions/projectSituation.js
@@ -88,3 +88,13 @@ export function qrCodeShow (query) {
});
}
+export function q () {
+ return (dispatch) => basicAction({
+ type: 'get',
+ dispatch,
+ actionType: 'GET_CODE',
+ url: ApiTable.q,
+ msg: { error: '获取二维码列表失败', },
+ });
+}
+
diff --git a/web/client/src/sections/projectRegime/containers/information.js b/web/client/src/sections/projectRegime/containers/information.js
index a2853e8..f659e9b 100644
--- a/web/client/src/sections/projectRegime/containers/information.js
+++ b/web/client/src/sections/projectRegime/containers/information.js
@@ -95,7 +95,7 @@ const Information = (props) => {
key: 'operation',
render: (text, record, index) => {
return (
-
+
