From ffdc9a9646ab54bc910d7adacc4604f6e6ccc646 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Tue, 8 Nov 2022 10:39:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/control/containers/control.jsx | 239 ++++++++++++------ 1 file changed, 156 insertions(+), 83 deletions(-) diff --git a/web/client/src/sections/control/containers/control.jsx b/web/client/src/sections/control/containers/control.jsx index 4f6f71b..81d9d68 100644 --- a/web/client/src/sections/control/containers/control.jsx +++ b/web/client/src/sections/control/containers/control.jsx @@ -100,6 +100,50 @@ const Control = (props) => { }) } concentration2() + + const domProject = document.getElementById("news"); + if (domProject) { + newScrollbar = new PerfectScrollbar("#news", { + suppressScrollX: true, + }); + } + + const domProject2 = document.getElementById("member"); + if (domProject2) { + memberScrollbar = new PerfectScrollbar("#member", { + suppressScrollX: true, + }); + } + + const domProject3 = document.getElementById("equipment"); + if (domProject3) { + equipmentScrollbar = new PerfectScrollbar("#equipment", { + suppressScrollX: true, + }); + } + + const domProject4 = document.getElementById("web"); + if (domProject4) { + webScrollbar = new PerfectScrollbar("#web", { + suppressScrollX: true, + }) + } + + const domProject5 = document.getElementById("problems"); + if (domProject5) { + problemsScrollbar = new PerfectScrollbar("#problems", { + suppressScrollX: true, + }); + } + + const domProject6 = document.getElementById("alarm"); + if (domProject6) { + alarmScrollbar = new PerfectScrollbar("#alarm", { + suppressScrollY: true, + }); + } + + return () => { } @@ -271,6 +315,25 @@ const Control = (props) => { } } concentration3() + + const domProject1 = document.getElementById("overviewCalc"); + if (domProject1) { + overviewScrollbar = new PerfectScrollbar("#overviewCalc", { + suppressScrollY: true, + }); + } + const pomsList = document.getElementById("pomsList"); + if (pomsList) { + pomsListScrollbar = new PerfectScrollbar("#pomsList", { + suppressScrollX: true, + }); + } + const domProject5 = document.getElementById("problems"); + if (domProject5) { + problemsScrollbar = new PerfectScrollbar("#problems", { + suppressScrollX: true, + }); + } }, [pepProjectId, exhibition.current]) useEffect(() => { @@ -342,9 +405,9 @@ const Control = (props) => { const domProject = document.getElementById("news"); if (domProject) { - newScrollbar = new PerfectScrollbar("#news", { - suppressScrollX: true, - }); + // newScrollbar = new PerfectScrollbar("#news", { + // suppressScrollX: true, + // }); if (domProject && newScrollbar) { newScrollbar.update(); } @@ -352,19 +415,19 @@ const Control = (props) => { const pomsList = document.getElementById("pomsList"); if (pomsList) { - pomsListScrollbar = new PerfectScrollbar("#pomsList", { - suppressScrollX: true, - }); + // pomsListScrollbar = new PerfectScrollbar("#pomsList", { + // suppressScrollX: true, + // }); if (pomsList && pomsListScrollbar) { pomsListScrollbar.update(); } } - const domProject1 = document.getElementById("overview"); + const domProject1 = document.getElementById("overviewCalc"); if (domProject1) { - overviewScrollbar = new PerfectScrollbar("#overview", { - suppressScrollY: true, - }); + // overviewScrollbar = new PerfectScrollbar("#overviewCalc", { + // suppressScrollY: true, + // }); if (domProject1 && overviewScrollbar) { overviewScrollbar.update(); } @@ -372,9 +435,9 @@ const Control = (props) => { const domProject2 = document.getElementById("member"); if (domProject2) { - memberScrollbar = new PerfectScrollbar("#member", { - suppressScrollX: true, - }); + // memberScrollbar = new PerfectScrollbar("#member", { + // suppressScrollX: true, + // }); if (domProject2 && memberScrollbar) { memberScrollbar.update(); } @@ -382,9 +445,9 @@ const Control = (props) => { const domProject3 = document.getElementById("equipment"); if (domProject3) { - equipmentScrollbar = new PerfectScrollbar("#equipment", { - suppressScrollX: true, - }); + // equipmentScrollbar = new PerfectScrollbar("#equipment", { + // suppressScrollX: true, + // }); if (domProject3 && equipmentScrollbar) { equipmentScrollbar.update(); } @@ -392,9 +455,9 @@ const Control = (props) => { const domProject4 = document.getElementById("web"); if (domProject4) { - webScrollbar = new PerfectScrollbar("#web", { - suppressScrollX: true, - }) + // webScrollbar = new PerfectScrollbar("#web", { + // suppressScrollX: true, + // }) if (domProject4 && webScrollbar) { webScrollbar.update(); } @@ -402,9 +465,9 @@ const Control = (props) => { const domProject5 = document.getElementById("problems"); if (domProject5) { - problemsScrollbar = new PerfectScrollbar("#problems", { - suppressScrollX: true, - }); + // problemsScrollbar = new PerfectScrollbar("#problems", { + // suppressScrollX: true, + // }); if (domProject5 && problemsScrollbar) { problemsScrollbar.update(); } @@ -412,9 +475,9 @@ const Control = (props) => { const domProject6 = document.getElementById("alarm"); if (domProject6) { - alarmScrollbar = new PerfectScrollbar("#alarm", { - suppressScrollY: true, - }); + // alarmScrollbar = new PerfectScrollbar("#alarm", { + // suppressScrollY: true, + // }); if (domProject6 && alarmScrollbar) { alarmScrollbar.update(); } @@ -634,7 +697,8 @@ const Control = (props) => { {/* 统计概览 */} - {exhibition.current?.overall?.find(v => v.key == 'statistical') ? <> + { + exhibition.current?.overall?.find(v => v.key == 'statistical') ? <>
@@ -651,83 +715,92 @@ const Control = (props) => {
{/* 统计概览 */} -
+
{/* 项目 */} - {pepProjectId ? '' :
- {pomsList?.map((v, index) => { - return
setProjectId(v.pepProjectId)}>{v.pepProjectName}
- })} -
} + { + pepProjectId ? + '' : +
+ {pomsList?.map((v, index) => { + return
setProjectId(v.pepProjectId)}>{v.pepProjectName}
+ })} +
} {/* 项目里程碑 */} - {exhibition.current?.statistical?.find(v => v.key == 'milestone') && projectId && projectData?.find(u => u.id == projectId)?.pepProjectName ? -
-
- 项目里程碑 -
-
-
-
- 立项时间： -
-
- 暂无 -
+ { + exhibition.current?.statistical?.find(v => v.key == 'milestone') && projectId && + projectData?.find(u => u.id == projectId)?.pepProjectName ? +
+
+ 项目里程碑
-
-
- 施工时间： +
+
+
+ 立项时间： +
+
+ 暂无 +
-
- 暂无 +
+
+ 施工时间： +
+
+ 暂无 +
-
-
-
-
- 内验时间： +
+
+
+ 内验时间： +
+
+ 暂无 +
-
- 暂无 +
+
+ 外验时间： +
+
+ 暂无 +
-
+
- 外验时间： + 工程维保时间：
暂无
-
-
-
- 工程维保时间： -
-
- 暂无 -
-
-
-
-
- 售后维修时间： -
-
- 暂无 +
+
+
+ 售后维修时间： +
+
+ 暂无 +
+ {/* 进行中 */}
- {/* 进行中 */}
-
- : ""} + : ""} {/* 相关成员 */} {exhibition.current?.statistical?.find(v => v.key == 'personnel') ?
From bd491cf9c326022b47d8d0a33676388ef867070b Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Tue, 8 Nov 2022 10:47:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/control/containers/control.jsx | 2 +- .../control/containers/userCenter.jsx | 102 +++++++----------- 2 files changed, 38 insertions(+), 66 deletions(-) diff --git a/web/client/src/sections/control/containers/control.jsx b/web/client/src/sections/control/containers/control.jsx index 81d9d68..ac50be0 100644 --- a/web/client/src/sections/control/containers/control.jsx +++ b/web/client/src/sections/control/containers/control.jsx @@ -715,7 +715,7 @@ const Control = (props) => {
{/* 统计概览 */} -
+
{/* 项目 */} { diff --git a/web/client/src/sections/control/containers/userCenter.jsx b/web/client/src/sections/control/containers/userCenter.jsx index 4eb4b8c..11cc71e 100644 --- a/web/client/src/sections/control/containers/userCenter.jsx +++ b/web/client/src/sections/control/containers/userCenter.jsx @@ -7,76 +7,48 @@ import PerfectScrollbar from "perfect-scrollbar"; const { Meta } = Card; const UserCenter = (props) => { - const { dispatch, actions, user, loading, socket } = props - useEffect(() => { - console.log('user',user); - // ACTION 示例 - // dispatch(actions.example.getMembers(user.orgId)) - }, []) - useEffect(() => { + const { dispatch, actions, user, loading, socket } = props - // ACTION 示例 - // dispatch(actions.example.getMembers(user.orgId)) - }) - - // websocket 使用测试 - // useEffect(() => { - // console.log(socket) - // if (socket) { - // socket.on('TEST', function (msg) { - // console.info(msg); - // }); - // return () => { - // socket.off("TEST"); - // } - // } - - // }, [socket]) - - return ( - <> -
- {/* 头部 */} -
-
-
- HI，欢迎回来，行业服务部 -
-
- 刘昊然！ -
-
-
- {/* 主体 */} -
-
-
-
-
用户中心
-
USER CENTER
-
-
-
- - {user.name.split('')[0]} - -
-
- {/* moment(row.createTime).format("YYYY-MM-DD HH:mm:ss") */} + return ( + <> +
+ {/* 头部 */} +
+
+
+ HI，欢迎回来，行业服务部 +
+
+ 刘昊然！ +
+
+
+ {/* 主体 */} +
+
+
+
+
用户中心
+
USER CENTER
+
+
+
+ + {user.name.split('')[0]} + +
- - ) + {/* moment(row.createTime).format("YYYY-MM-DD HH:mm:ss") */} +
+ + ) } function mapStateToProps (state) { - const { auth, global, members, webSocket } = state; - return { - // loading: members.isRequesting, - user: auth.user, - // actions: global.actions, - // members: members.data, - // socket: webSocket.socket - }; + const { auth, global, members, webSocket } = state; + return { + user: auth.user, + }; } export default connect(mapStateToProps)(UserCenter);