From 2435d9d92fdbe06318bf3ca73b04397db310d50f Mon Sep 17 00:00:00 2001 From: 谢忠泽 Date: Fri, 28 Oct 2022 09:29:22 +0800 Subject: [PATCH] fix:table最小高度，删除测试数据 --- src/pages/vms/OperationAdministration/components/MapContent/index.tsx | 36 +++++++++++------------------------- src/pages/vms/OperationAdministration/components/MapContent/style.css | 2 +- src/pages/vms/OperationAdministration/components/MapContent/style.less | 2 +- src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx | 32 +++++++++++++++++++++++++++++++- src/pages/vms/OperationAdministration/components/PlayBackTable/style.css | 5 ++++- src/pages/vms/OperationAdministration/components/PlayBackTable/style.less | 7 +++++-- 6 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/pages/vms/OperationAdministration/components/MapContent/index.tsx b/src/pages/vms/OperationAdministration/components/MapContent/index.tsx index 3496993..e6442bd 100644 --- a/src/pages/vms/OperationAdministration/components/MapContent/index.tsx +++ b/src/pages/vms/OperationAdministration/components/MapContent/index.tsx @@ -25,19 +25,6 @@ function MapContent(props:any) { const amapCopy = useRef(null); const marker = useRef>([]); const [tracksFilter, setTracksFilter] = useState>([]); - const lineArr= [ - [116.478935, 39.997761], - [116.478939, 39.997825], - [116.478912, 39.998549], - [116.478912, 39.998549], - [116.478998, 39.998555], - [116.478998, 39.998555], - [116.479282, 39.99856], - [116.479658, 39.998528], - [116.480151, 39.998453], - [116.480784, 39.998302], - [116.480784, 39.998302], - [116.481149, 39.998184], [116.481573, 39.997997], [116.481863, 39.997846], [116.482072, 39.997718], [116.482362, 39.997718], [116.483633, 39.998935], [116.48367, 39.998968], [116.484648, 39.999861]]; useEffect(() => { initMap(); return () => { @@ -70,7 +57,6 @@ function MapContent(props:any) { item.endPoint && tracksArr.push(item?.endPoint?.location.split(',').map(Number)); tracksArr.length && tracksFilterData.push(tracksArr); }); - tracksFilterData.push(lineArr); setTracksFilter(tracksFilterData); mapPlayBack(tracksFilterData); }).catch((e) => { @@ -248,18 +234,18 @@ function MapContent(props:any) {
{ - tracksFilter.length && ( -
-
- - + tracksFilter.length? ( +
+
+ + +
+
+ + +
-
- - -
-
- ) + ):null }
diff --git a/src/pages/vms/OperationAdministration/components/MapContent/style.css b/src/pages/vms/OperationAdministration/components/MapContent/style.css index 1770e48..b6db94f 100644 --- a/src/pages/vms/OperationAdministration/components/MapContent/style.css +++ b/src/pages/vms/OperationAdministration/components/MapContent/style.css @@ -17,7 +17,7 @@ padding: 0px; margin: 0px; width: 100%; - height: 750px; + height: 700px; } .map_box .play_back_btn_box { position: absolute; diff --git a/src/pages/vms/OperationAdministration/components/MapContent/style.less b/src/pages/vms/OperationAdministration/components/MapContent/style.less index eedb985..cce9956 100644 --- a/src/pages/vms/OperationAdministration/components/MapContent/style.less +++ b/src/pages/vms/OperationAdministration/components/MapContent/style.less @@ -18,7 +18,7 @@ padding: 0px; margin: 0px; width: 100%; - height: 750px; + height: 700px; } .play_back_btn_box{ position: absolute; diff --git a/src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx b/src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx index 7679ac9..971f2ae 100644 --- a/src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx +++ b/src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx @@ -55,10 +55,35 @@ function PlayBackPicker(props:any) { * @return {*} */ const disabledTracksTime = (date:any, type:any) => { - if (!date) return; + if (!date) return; const {_d: checkDate, _i: nowDate} = date; const checkYear = moment(checkDate).format('YYYY-MM-DD'); const nowYear = moment(nowDate).format('YYYY-MM-DD'); + console.log('type', type); + // if (type === 'start') { + // const hour = moment(date).hour(); + // const minute = moment(date).minute(); + // const second = moment(date).second(); + // return { + // disabledHours: () => { + // const disabledArr = timeArr(24).splice(hour + 1, timeArr(24).length - hour - 1); + // console.log('disabledArr1', disabledArr); + // return disabledArr; + // }, + // disabledMinutes: () => { + // const disabledArr = timeArr(60).splice(minute, timeArr(60).length - minute); + // console.log('disabledArr2', disabledArr); + + // return disabledArr; + // }, + // disabledSeconds: () => { + // const disabledArr = timeArr(60).splice(second, timeArr(60).length - second); + // console.log('disabledArr3', disabledArr); + + // return disabledArr; + // }, + // }; + // } if (checkYear === nowYear) { const nowHour = moment(nowDate).hour(); const nowMinute = moment(nowDate).minute(); @@ -125,6 +150,11 @@ function PlayBackPicker(props:any) { date.current = dateTimestamp; handelDate(dateTimestamp); }} + onOk={ + (val:any) => { + console.log('val', val); + } + } />
); diff --git a/src/pages/vms/OperationAdministration/components/PlayBackTable/style.css b/src/pages/vms/OperationAdministration/components/PlayBackTable/style.css index 0540ded..bbce137 100644 --- a/src/pages/vms/OperationAdministration/components/PlayBackTable/style.css +++ b/src/pages/vms/OperationAdministration/components/PlayBackTable/style.css @@ -2,6 +2,9 @@ width: 100%; height: 100%; } -.play_back_table .ant-table-cell { +.play_back_table .ant-table { + min-height: 700px; +} +.play_back_table .ant-table .ant-table-cell { max-width: 100px !important; } diff --git a/src/pages/vms/OperationAdministration/components/PlayBackTable/style.less b/src/pages/vms/OperationAdministration/components/PlayBackTable/style.less index 18bf2fc..0c63366 100644 --- a/src/pages/vms/OperationAdministration/components/PlayBackTable/style.less +++ b/src/pages/vms/OperationAdministration/components/PlayBackTable/style.less @@ -1,7 +1,10 @@ .play_back_table{ width: 100%; height: 100%; - .ant-table-cell{ - max-width: 100px !important; + .ant-table{ + min-height: 700px; + .ant-table-cell{ + max-width: 100px !important; + } } } \ No newline at end of file -- libgit2 0.22.2