diff --git a/web/client/src/layout/containers/layout/index.js b/web/client/src/layout/containers/layout/index.js index 45cac6e..6b1dd47 100644 --- a/web/client/src/layout/containers/layout/index.js +++ b/web/client/src/layout/containers/layout/index.js @@ -67,7 +67,7 @@ const LayoutContainer = props => { dom.scrollTop = 0; } }) - + return ( @@ -100,10 +100,10 @@ const LayoutContainer = props => { background: '#F2F3F5' }}>
-
+
-
+
{children}
diff --git a/web/client/src/sections/shouye/containers/shouye.js b/web/client/src/sections/shouye/containers/shouye.js index 02eb320..93ca22d 100644 --- a/web/client/src/sections/shouye/containers/shouye.js +++ b/web/client/src/sections/shouye/containers/shouye.js @@ -29,7 +29,6 @@ const Information = (props) => { useEffect(() => { dispatch(getPatrolPlan()).then(async (res) => { const res2 = await dispatch(patrolManage.records(`patrolRecord/all/${times[0]}/${times[1]}/null/null`)) - console.log(res2, 'res2') setshijiandata(res2?.payload?.data) setxunjiandata(res2?.payload?.data.filter(i => parseInt(moment().format('YYYYMMDD')) === parseInt(moment(i.inspectionTime).format('YYYYMMDD')))) let num = 0 @@ -63,14 +62,11 @@ const Information = (props) => { // &&moment(j.inspectionTim).month()===moment().month()).length { let arr1 = [], arr2 = [], arr4 = []