diff --git a/web/client/src/sections/fillion/components/gis/patrolGis.js b/web/client/src/sections/fillion/components/gis/patrolGis.js
index cf422dde..d19399d3 100644
--- a/web/client/src/sections/fillion/components/gis/patrolGis.js
+++ b/web/client/src/sections/fillion/components/gis/patrolGis.js
@@ -49,6 +49,7 @@ function PatrolGis(props) {
}, [userId, dateRange])
useEffect(() => {
+ console.log('userId', userId)
if (reportList && mapObj) {
mapObj.clearMap();
renderMarkers();
@@ -142,7 +143,7 @@ function PatrolGis(props) {
});
}
}
-
+ // , display: userId ? 'block' : 'none'
return (
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index 62d58024..2c866cab 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -960,7 +960,7 @@ const PatrolNameList = (props) => {
const PatrolTable = (props) => {
const { allDepUsers, clientHeight, user, userList, reportList, dispatch, reportListLoading, reportDetail, reportDetailLoading, userLoading, exports, pathname, anspectionNotificationPhoneList } = props;
const [record, setRecord] = useState(1);
- // const [recordCopy, setRecordCopy] = useState();
+ const [recordCopy, setRecordCopy] = useState();
const [dateRange, setDateRange] = useState();
const [selectProjectType, setSelectProjectType] = useState('');
const [detailVisible, setDetailVisible] = useState(false)
@@ -1016,9 +1016,11 @@ const PatrolTable = (props) => {
useEffect(() => {
if (activeTabKey1 && activeTabKey1 == 'tab2') {
- setRecord(null);
+ setRecordCopy(null)
} else if (activeTabKey1 && activeTabKey1 == 'tab1') {
// setRecord(userList[0]);
+ queryData()
+
}
}, [activeTabKey1])
const handelRefresh = () => {
@@ -1054,19 +1056,21 @@ const PatrolTable = (props) => {
],
- tab2: