Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web
This commit is contained in:
wyw
commit
caa959747d
@ -59,7 +59,7 @@ class FoUserInfoShow extends React.Component {
|
||||
postName = ret[0]?.Nav_Person.Nav_Post?.NAME
|
||||
this.setState({ //设置setState全局变量
|
||||
userPhone: ret[0]?.PHONE,
|
||||
Department: ret[0]?.Nav_Department.NAME,
|
||||
Department: ret[0]?.Nav_Department?.NAME,
|
||||
teamName: teamName,
|
||||
postName: postName,
|
||||
})
|
||||
|
||||
@ -54,7 +54,6 @@ const Sider = (props) => {
|
||||
};
|
||||
/** 子菜单路由 */
|
||||
const navToMenu = (menu) => {
|
||||
console.log("12312312312", menu);
|
||||
props.history.push({ pathname: `/main/${menu.ID}` });
|
||||
};
|
||||
|
||||
@ -73,7 +72,6 @@ const Sider = (props) => {
|
||||
/** 已激活菜单 */
|
||||
const [activeMenu, setActiveMenu] = useState(null);
|
||||
const handleActiveMenu = (menu) => {
|
||||
console.log("111111");
|
||||
setActiveMenu(menu);
|
||||
navToMenu(menu);
|
||||
};
|
||||
|
||||
@ -23,6 +23,7 @@ import {
|
||||
Dropdown,
|
||||
Menu,
|
||||
Empty,
|
||||
Modal
|
||||
} from "antd";
|
||||
import styles from "./dashboard.css";
|
||||
import "slick-carousel/slick/slick.css";
|
||||
@ -31,6 +32,7 @@ import echarts from "echarts";
|
||||
import config from "../config";
|
||||
import ModifyPassword from "../components/MainPage/ModifyPassword";
|
||||
import FoUserInfoShow from "../components/MainPage/FoUserInfoShow";
|
||||
import FormPage from "../components/FormPage";
|
||||
const { TabPane } = Tabs;
|
||||
const WorkBench = (props) => {
|
||||
return (
|
||||
@ -46,7 +48,7 @@ const WorkBench = (props) => {
|
||||
? "已读"
|
||||
: "已办";
|
||||
const type = props.index == 1 || props.index == 2 ? prepare : warning;
|
||||
|
||||
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
@ -58,6 +60,10 @@ const WorkBench = (props) => {
|
||||
borderBottom:
|
||||
index !== props.data.length - 1 ? "1px solid #e7e6e4" : "",
|
||||
}}
|
||||
className="home-work-back"
|
||||
onClick={() => {
|
||||
props.benchCLick(item);
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className={
|
||||
@ -136,7 +142,11 @@ class Home extends React.Component {
|
||||
userInfo: "",
|
||||
timeNow: "上午好",
|
||||
workData: [],
|
||||
workTotal:'',
|
||||
workTotal: "",
|
||||
tableKey: "1",
|
||||
formVisible: false,
|
||||
noticeTitle: "",
|
||||
tmpData: {},
|
||||
completeName: [
|
||||
{
|
||||
name: "张森友",
|
||||
@ -192,14 +202,96 @@ class Home extends React.Component {
|
||||
tabsCallback = (key) => {
|
||||
if (key == 1) {
|
||||
this.getBaseData(1, "1", 5);
|
||||
this.setState({
|
||||
tableKey: "1",
|
||||
});
|
||||
} else if (key == 2) {
|
||||
this.getBaseData(1, "4", 5);
|
||||
this.setState({
|
||||
tableKey: "4",
|
||||
});
|
||||
} else if (key == 3) {
|
||||
this.getBaseData(1, "2", 5);
|
||||
this.setState({
|
||||
tableKey: "2",
|
||||
});
|
||||
} else {
|
||||
this.getBaseData(1, "3", 5);
|
||||
this.setState({
|
||||
tableKey: "3",
|
||||
});
|
||||
}
|
||||
};
|
||||
workClick = (e) => {
|
||||
this.showEditModal(
|
||||
e.SOURCE_DATA_ID,
|
||||
e.SOURCE_FORMCODE,
|
||||
e.ID,
|
||||
e.NOTICE_TITLE,
|
||||
e.CODE
|
||||
);
|
||||
};
|
||||
showEditModal = (dataId, formCode, TaskID, title, taskCode) => {
|
||||
this.props.dispatch({
|
||||
type: "app/getDataByPost",
|
||||
url: "BI/BIController/getVersion",
|
||||
onComplete: (ret) => {
|
||||
if (ret > config.version) {
|
||||
window.localStorage.clear();
|
||||
message.success("清除成功，即将重新加载页面", 2, () => {
|
||||
setTimeout(() => window.location.reload(true), 500);
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
const newtmpData = {
|
||||
data: {
|
||||
id: dataId,
|
||||
TaskID: TaskID,
|
||||
onCancel: this.handleCancel,
|
||||
taskCode: taskCode,
|
||||
tableKey: this.state.tableKey,
|
||||
homeReload: true,
|
||||
},
|
||||
formCode: formCode,
|
||||
};
|
||||
this.setState(
|
||||
{
|
||||
noticeTitle: title,
|
||||
taskCode: taskCode,
|
||||
tmpData: newtmpData,
|
||||
currActivatedMenu: "",
|
||||
},
|
||||
() =>{
|
||||
this.setState({
|
||||
formVisible: true,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
);
|
||||
};
|
||||
clearData = () => {
|
||||
let newtmpData = { ...this.state.tmpData };
|
||||
newtmpData["data"].id = "";
|
||||
newtmpData["data"].homeReload = false;
|
||||
newtmpData.formCode = "";
|
||||
this.setState({
|
||||
formVisible: false,
|
||||
tmpData: [], //newtmpData
|
||||
});
|
||||
};
|
||||
handleCancel = () => {
|
||||
// 退出弹窗
|
||||
this.getBaseData(1, this.state.tableKey, 5);
|
||||
this.clearData();
|
||||
};
|
||||
closeModal=()=>{
|
||||
this.setState({
|
||||
formVisible: false,
|
||||
})
|
||||
}
|
||||
getBaseData = (pagination, key, limit) => {
|
||||
const current = pagination ? pagination.current : 1;
|
||||
const json = initFilter(this.props.login.OrgId, "", "CODE", 1, current);
|
||||
@ -574,13 +666,13 @@ class Home extends React.Component {
|
||||
fontSize: "20",
|
||||
},
|
||||
},
|
||||
color: '#ffd6b5',
|
||||
color: "#ffd6b5",
|
||||
legend: {
|
||||
show: false,
|
||||
itemGap: 12,
|
||||
data: ["01", "02"],
|
||||
},
|
||||
|
||||
|
||||
series: [
|
||||
{
|
||||
name: "Line 1",
|
||||
@ -835,7 +927,7 @@ class Home extends React.Component {
|
||||
handleUserMenuClick = (evt) => {
|
||||
switch (evt.key) {
|
||||
case "user-menu-logout":
|
||||
handleLogout();
|
||||
this.handleLogout();
|
||||
break;
|
||||
case "user-menu-cacheclean":
|
||||
window.localStorage.clear();
|
||||
@ -863,6 +955,19 @@ class Home extends React.Component {
|
||||
}}
|
||||
ref={this.resizeRef}
|
||||
>
|
||||
<Modal
|
||||
visible={this.state.formVisible}
|
||||
title={this.state.noticeTitle}
|
||||
maskClosable={false}
|
||||
onCancel={this.handleCancel}
|
||||
footer={null}
|
||||
className="antd-modal-fullscreen"
|
||||
closeModal={this.closeModal}
|
||||
// forceRender={true}
|
||||
>
|
||||
<FormPage {...this.state.tmpData} />
|
||||
</Modal>
|
||||
|
||||
<Col span={24} style={{ width: "100%", height: "100%" }}>
|
||||
<Row
|
||||
gutter={12}
|
||||
@ -1054,10 +1159,26 @@ class Home extends React.Component {
|
||||
</div>
|
||||
</div>
|
||||
<div className="home-userInfo-card">
|
||||
<UserInfo data={this.state.workTotal.todoCount} title="待办事项" color="#2177d5" />
|
||||
<UserInfo data={this.state.workTotal.timeOverCount} title="待办超时" color="#f76707" />
|
||||
<UserInfo data={this.state.workTotal.doneCount} title="已办事项" color="#48a447" />
|
||||
<UserInfo data={this.state.workTotal.todayNewCount} title="今日提醒" color="#fcc419" />
|
||||
<UserInfo
|
||||
data={this.state.workTotal.todoCount}
|
||||
title="待办事项"
|
||||
color="#2177d5"
|
||||
/>
|
||||
<UserInfo
|
||||
data={this.state.workTotal.timeOverCount}
|
||||
title="待办超时"
|
||||
color="#f76707"
|
||||
/>
|
||||
<UserInfo
|
||||
data={this.state.workTotal.doneCount}
|
||||
title="已办事项"
|
||||
color="#48a447"
|
||||
/>
|
||||
<UserInfo
|
||||
data={this.state.workTotal.todayNewCount}
|
||||
title="今日提醒"
|
||||
color="#fcc419"
|
||||
/>
|
||||
</div>
|
||||
</Col>
|
||||
<div style={{ width: "30px" }}></div>
|
||||
@ -1326,7 +1447,11 @@ class Home extends React.Component {
|
||||
}}
|
||||
>
|
||||
{this.state.workData.length > 0 ? (
|
||||
<WorkBench data={this.state.workData} index={1} />
|
||||
<WorkBench
|
||||
data={this.state.workData}
|
||||
index={1}
|
||||
benchCLick={this.workClick}
|
||||
/>
|
||||
) : (
|
||||
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
|
||||
)}
|
||||
@ -1353,7 +1478,11 @@ class Home extends React.Component {
|
||||
}}
|
||||
>
|
||||
{this.state.workData.length > 0 ? (
|
||||
<WorkBench data={this.state.workData} index={2} />
|
||||
<WorkBench
|
||||
data={this.state.workData}
|
||||
index={2}
|
||||
benchCLick={this.workClick}
|
||||
/>
|
||||
) : (
|
||||
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
|
||||
)}
|
||||
@ -1380,7 +1509,11 @@ class Home extends React.Component {
|
||||
}}
|
||||
>
|
||||
{this.state.workData.length > 0 ? (
|
||||
<WorkBench data={this.state.workData} index={3} />
|
||||
<WorkBench
|
||||
data={this.state.workData}
|
||||
index={3}
|
||||
benchCLick={this.workClick}
|
||||
/>
|
||||
) : (
|
||||
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
|
||||
)}
|
||||
@ -1407,7 +1540,11 @@ class Home extends React.Component {
|
||||
}}
|
||||
>
|
||||
{this.state.workData.length > 0 ? (
|
||||
<WorkBench data={this.state.workData} index={4} />
|
||||
<WorkBench
|
||||
data={this.state.workData}
|
||||
index={4}
|
||||
benchCLick={this.workClick}
|
||||
/>
|
||||
) : (
|
||||
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
|
||||
)}
|
||||
|
||||
@ -240,6 +240,10 @@
|
||||
font-size: 12px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
:global(.home-work-back):hover {
|
||||
background-color: #eef5ff;
|
||||
cursor: pointer;
|
||||
}
|
||||
:global(.home-work-icon) {
|
||||
padding: 3px 5px;
|
||||
margin-right: 10px;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user