Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

web/client/src/sections/control/containers/control.jsx

@@ -103,6 +103,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 () => {
 
       }
@@ -274,6 +318,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(() => {
@@ -345,9 +408,9 @@ const Control = (props) => {
 
       const domProject = document.getElementById("news");
       if (domProject) {
-         newScrollbar = new PerfectScrollbar("#news", {
+         // newScrollbar = new PerfectScrollbar("#news", {
-            suppressScrollX: true,
+         //    suppressScrollX: true,
-         });
+         // });
          if (domProject && newScrollbar) {
             newScrollbar.update();
          }
@@ -355,19 +418,19 @@ const Control = (props) => {
 
       const pomsList = document.getElementById("pomsList");
       if (pomsList) {
-         pomsListScrollbar = new PerfectScrollbar("#pomsList", {
+         // pomsListScrollbar = new PerfectScrollbar("#pomsList", {
-            suppressScrollX: true,
+         //    suppressScrollX: true,
-         });
+         // });
          if (pomsList && pomsListScrollbar) {
             pomsListScrollbar.update();
          }
       }
 
-      const domProject1 = document.getElementById("overview");
+      const domProject1 = document.getElementById("overviewCalc");
       if (domProject1) {
-         overviewScrollbar = new PerfectScrollbar("#overview", {
+         // overviewScrollbar = new PerfectScrollbar("#overviewCalc", {
-            suppressScrollY: true,
+         //    suppressScrollY: true,
-         });
+         // });
          if (domProject1 && overviewScrollbar) {
             overviewScrollbar.update();
          }
@@ -375,9 +438,9 @@ const Control = (props) => {
 
       const domProject2 = document.getElementById("member");
       if (domProject2) {
-         memberScrollbar = new PerfectScrollbar("#member", {
+         // memberScrollbar = new PerfectScrollbar("#member", {
-            suppressScrollX: true,
+         //    suppressScrollX: true,
-         });
+         // });
          if (domProject2 && memberScrollbar) {
             memberScrollbar.update();
          }
@@ -385,9 +448,9 @@ const Control = (props) => {
 
       const domProject3 = document.getElementById("equipment");
       if (domProject3) {
-         equipmentScrollbar = new PerfectScrollbar("#equipment", {
+         // equipmentScrollbar = new PerfectScrollbar("#equipment", {
-            suppressScrollX: true,
+         //    suppressScrollX: true,
-         });
+         // });
          if (domProject3 && equipmentScrollbar) {
             equipmentScrollbar.update();
          }
@@ -395,9 +458,9 @@ const Control = (props) => {
 
       const domProject4 = document.getElementById("web");
       if (domProject4) {
-         webScrollbar = new PerfectScrollbar("#web", {
+         // webScrollbar = new PerfectScrollbar("#web", {
-            suppressScrollX: true,
+         //    suppressScrollX: true,
-         })
+         // })
          if (domProject4 && webScrollbar) {
             webScrollbar.update();
          }
@@ -405,9 +468,9 @@ const Control = (props) => {
 
       const domProject5 = document.getElementById("problems");
       if (domProject5) {
-         problemsScrollbar = new PerfectScrollbar("#problems", {
+         // problemsScrollbar = new PerfectScrollbar("#problems", {
-            suppressScrollX: true,
+         //    suppressScrollX: true,
-         });
+         // });
          if (domProject5 && problemsScrollbar) {
             problemsScrollbar.update();
          }
@@ -415,9 +478,9 @@ const Control = (props) => {
 
       const domProject6 = document.getElementById("alarm");
       if (domProject6) {
-         alarmScrollbar = new PerfectScrollbar("#alarm", {
+         // alarmScrollbar = new PerfectScrollbar("#alarm", {
-            suppressScrollY: true,
+         //    suppressScrollY: true,
-         });
+         // });
          if (domProject6 && alarmScrollbar) {
             alarmScrollbar.update();
          }
@@ -637,7 +700,8 @@ const Control = (props) => {
 
 
                      {/* 统计概览 */}
-                     {exhibition.current?.overall?.find(v => v.key == 'statistical') ? <>
+                     {
+                     exhibition.current?.overall?.find(v => v.key == 'statistical') ? <>
                         <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginTop: 25 }}>
                            <div style={{ display: 'flex', alignItems: 'center' }}>
                               <div style={{ width: 0, height: 20, borderLeft: '3px solid #005ABD', borderTop: '3px solid transparent', borderBottom: '3px solid transparent' }}></div>
@@ -654,10 +718,15 @@ const Control = (props) => {
                            </div>
                         </div>
                         {/* 统计概览 */}
-                        <div id='overview' style={{ position: 'relative' }}>
+                        <div id='overviewCalc' style={{ width: 'calc(100%)', position: 'relative' }}>
                            <div style={{ display: 'inline-flex', marginTop: 16 }}>
                               {/* 项目 */}
-                              {pepProjectId ? '' : <div id='pomsList' style={{ marginRight: 20, paddingRight: 24, position: 'relative', marginBottom: 30, width: 410, height: 221, border: '1px solid rgba(220,222,224,0.2)', boxShadow: '0px 2px 12px 1px #F2F3F5', borderRadius: 2 }}>
+                              {
+                                 pepProjectId ?
+                                    '' :
+                                    <div id='pomsList' style={{
+                                       marginRight: 20, paddingRight: 24, position: 'relative', marginBottom: 30, width: 410, height: 221, border: '1px solid rgba(220,222,224,0.2)', boxShadow: '0px 2px 12px 1px #F2F3F5', borderRadius: 2
+                                    }}>
                                        {pomsList?.map((v, index) => {
                                           return <div key={'pomsList' + index} title={v.pepProjectName}
                                              style={{
@@ -669,8 +738,12 @@ const Control = (props) => {
                                     </div>}
 
                               {/* 项目里程碑 */}
-                              {exhibition.current?.statistical?.find(v => v.key == 'milestone') && projectId && projectData?.find(u => u.id == projectId)?.pepProjectName ?
+                              {
-                                 <div style={{ marginBottom: 30, width: 466, height: 221, border: '1px solid rgba(220,222,224,0.2)', boxShadow: '0px 2px 12px 1px #F2F3F5', borderRadius: 2 }}>
+                                 exhibition.current?.statistical?.find(v => v.key == 'milestone') && projectId &&
+                                    projectData?.find(u => u.id == projectId)?.pepProjectName ?
+                                    <div style={{
+                                       marginBottom: 30, width: 466, height: 221, border: '1px solid rgba(220,222,224,0.2)', boxShadow: '0px 2px 12px 1px #F2F3F5', borderRadius: 2
+                                    }}>
                                        <div style={{ margin: '20px 0px 20px 24px', color: '#4A4A4A', fontSize: 16, fontWeight: 'bold' }}>
                                           项目里程碑
                                        </div>

web/client/src/sections/control/containers/userCenter.jsx

@@ -8,30 +8,6 @@ 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(() => {
-
-        // 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 (
       <>
@@ -71,11 +47,7 @@ const UserCenter = (props) => {
 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
    };
 }