diff --git a/web/client/src/index.js b/web/client/src/index.js
index 526c1ec..aba3f6d 100644
--- a/web/client/src/index.js
+++ b/web/client/src/index.js
@@ -4,4 +4,4 @@ import React from 'react';
import { render } from 'react-dom';
import App from './app';
-render((), document.getElementById('App'));
\ No newline at end of file
+render((), document.getElementById('App'));
\ No newline at end of file
diff --git a/web/client/src/layout/components/header/index.js b/web/client/src/layout/components/header/index.js
index 7038199..c1df51f 100644
--- a/web/client/src/layout/components/header/index.js
+++ b/web/client/src/layout/components/header/index.js
@@ -37,7 +37,8 @@ const Header = props => {
{collapsed ? : }
diff --git a/web/client/src/layout/containers/layout/index.js b/web/client/src/layout/containers/layout/index.js
index a6e747e..f4f3189 100644
--- a/web/client/src/layout/containers/layout/index.js
+++ b/web/client/src/layout/containers/layout/index.js
@@ -44,9 +44,7 @@ const LayoutContainer = props => {
useEffect(() => {
resize_(collapsed)
scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true });
- if (!sites.length) {
- dispatch(getUserSiteList());//获取工地列表
- }
+
}, [])
useEffect(() => {
diff --git a/web/client/src/sections/auth/containers/login.js b/web/client/src/sections/auth/containers/login.js
index 63564ea..8f6ea32 100644
--- a/web/client/src/sections/auth/containers/login.js
+++ b/web/client/src/sections/auth/containers/login.js
@@ -34,7 +34,7 @@ const Login = props => {
useEffect(() => {
if (user && user.authorized) {
- dispatch(push('/homePage'));
+ dispatch(push('/projectRegime/information'));
}
}, [user])
diff --git a/web/client/src/sections/projectRegime/components/projectAddModel.js b/web/client/src/sections/projectRegime/components/projectAddModel.js
index 0f6ef6c..5f5dcd6 100644
--- a/web/client/src/sections/projectRegime/components/projectAddModel.js
+++ b/web/client/src/sections/projectRegime/components/projectAddModel.js
@@ -1,5 +1,6 @@
import React, { useState } from 'react';
import { Button, Form, Input, Modal, Select, DatePicker } from 'antd';
+const { TextArea } = Input;
import { connect } from 'react-redux';
import Uploads from '$components/Uploads';
import { useEffect } from 'react';
@@ -8,8 +9,6 @@ import moment from 'moment';
const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, firmList }) => {
const { projectRegime } = actions
- const { RangePicker } = DatePicker;
-
const [form] = Form.useForm();
useEffect(() => {
@@ -17,18 +16,6 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
}, [])
- const validSjh = (rule, value, callback) => {
- const sjh = /^1(3|4|5|6|7|8|9)\d{9}$/;//手机号
- if (value) {
- let valid = sjh.test(value);
- if (!valid) {
- return callback([new Error("手机号填写错误")]);
- }
- callback();
- }
- return callback([new Error("请输入手机号")]);
- };
-
return (
+
+
+
+
+
+
+
+
+
+
+ ~
+
+
+
+
+
+
+
说明:请上传png,jpg格式图片,图片大小不超过5M,建议图片宽高比16:9 }
rules={[{ required: true, message: '请上传图片', },]}
@@ -94,105 +107,6 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
})}
/>
-