Commit 2435d9d92fdbe06318bf3ca73b04397db310d50f
1 parent
af2e92c0
fix:table最小高度,删除测试数据
Showing
6 changed files
with
53 additions
and
31 deletions
src/pages/vms/OperationAdministration/components/MapContent/index.tsx
@@ -25,19 +25,6 @@ function MapContent(props:any) { | @@ -25,19 +25,6 @@ function MapContent(props:any) { | ||
25 | const amapCopy = useRef<any>(null); | 25 | const amapCopy = useRef<any>(null); |
26 | const marker = useRef<Array<any>>([]); | 26 | const marker = useRef<Array<any>>([]); |
27 | const [tracksFilter, setTracksFilter] = useState<Array<any>>([]); | 27 | const [tracksFilter, setTracksFilter] = useState<Array<any>>([]); |
28 | - const lineArr= [ | ||
29 | - [116.478935, 39.997761], | ||
30 | - [116.478939, 39.997825], | ||
31 | - [116.478912, 39.998549], | ||
32 | - [116.478912, 39.998549], | ||
33 | - [116.478998, 39.998555], | ||
34 | - [116.478998, 39.998555], | ||
35 | - [116.479282, 39.99856], | ||
36 | - [116.479658, 39.998528], | ||
37 | - [116.480151, 39.998453], | ||
38 | - [116.480784, 39.998302], | ||
39 | - [116.480784, 39.998302], | ||
40 | - [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]]; | ||
41 | useEffect(() => { | 28 | useEffect(() => { |
42 | initMap(); | 29 | initMap(); |
43 | return () => { | 30 | return () => { |
@@ -70,7 +57,6 @@ function MapContent(props:any) { | @@ -70,7 +57,6 @@ function MapContent(props:any) { | ||
70 | item.endPoint && tracksArr.push(item?.endPoint?.location.split(',').map(Number)); | 57 | item.endPoint && tracksArr.push(item?.endPoint?.location.split(',').map(Number)); |
71 | tracksArr.length && tracksFilterData.push(tracksArr); | 58 | tracksArr.length && tracksFilterData.push(tracksArr); |
72 | }); | 59 | }); |
73 | - tracksFilterData.push(lineArr); | ||
74 | setTracksFilter(tracksFilterData); | 60 | setTracksFilter(tracksFilterData); |
75 | mapPlayBack(tracksFilterData); | 61 | mapPlayBack(tracksFilterData); |
76 | }).catch((e) => { | 62 | }).catch((e) => { |
@@ -248,18 +234,18 @@ function MapContent(props:any) { | @@ -248,18 +234,18 @@ function MapContent(props:any) { | ||
248 | </div> | 234 | </div> |
249 | <div id={id} className="map_main" /> | 235 | <div id={id} className="map_main" /> |
250 | { | 236 | { |
251 | - tracksFilter.length && ( | ||
252 | - <div className="play_back_btn_box"> | ||
253 | - <div className="btn_item"> | ||
254 | - <Button type="primary" className="play_back_btn" onClick={startAnimation}>开始回放</Button> | ||
255 | - <Button type="primary" className="play_back_btn" onClick={pauseAnimation}>暂停回放</Button> | 237 | + tracksFilter.length? ( |
238 | + <div className="play_back_btn_box"> | ||
239 | + <div className="btn_item"> | ||
240 | + <Button type="primary" className="play_back_btn" onClick={startAnimation}>开始回放</Button> | ||
241 | + <Button type="primary" className="play_back_btn" onClick={pauseAnimation}>暂停回放</Button> | ||
242 | + </div> | ||
243 | + <div className="btn_item"> | ||
244 | + <Button type="primary" className="play_back_btn" onClick={resumeAnimation}>继续回放</Button> | ||
245 | + <Button type="primary" className="play_back_btn" onClick={stopAnimation}>停止回放</Button> | ||
246 | + </div> | ||
256 | </div> | 247 | </div> |
257 | - <div className="btn_item"> | ||
258 | - <Button type="primary" className="play_back_btn" onClick={resumeAnimation}>继续回放</Button> | ||
259 | - <Button type="primary" className="play_back_btn" onClick={stopAnimation}>停止回放</Button> | ||
260 | - </div> | ||
261 | - </div> | ||
262 | - ) | 248 | + ):null |
263 | } | 249 | } |
264 | 250 | ||
265 | </div> | 251 | </div> |
src/pages/vms/OperationAdministration/components/MapContent/style.css
src/pages/vms/OperationAdministration/components/MapContent/style.less
src/pages/vms/OperationAdministration/components/PlayBackPicker/index.tsx
@@ -55,10 +55,35 @@ function PlayBackPicker(props:any) { | @@ -55,10 +55,35 @@ function PlayBackPicker(props:any) { | ||
55 | * @return {*} | 55 | * @return {*} |
56 | */ | 56 | */ |
57 | const disabledTracksTime = (date:any, type:any) => { | 57 | const disabledTracksTime = (date:any, type:any) => { |
58 | - if (!date) return; | 58 | + if (!date) return; |
59 | const {_d: checkDate, _i: nowDate} = date; | 59 | const {_d: checkDate, _i: nowDate} = date; |
60 | const checkYear = moment(checkDate).format('YYYY-MM-DD'); | 60 | const checkYear = moment(checkDate).format('YYYY-MM-DD'); |
61 | const nowYear = moment(nowDate).format('YYYY-MM-DD'); | 61 | const nowYear = moment(nowDate).format('YYYY-MM-DD'); |
62 | + console.log('type', type); | ||
63 | + // if (type === 'start') { | ||
64 | + // const hour = moment(date).hour(); | ||
65 | + // const minute = moment(date).minute(); | ||
66 | + // const second = moment(date).second(); | ||
67 | + // return { | ||
68 | + // disabledHours: () => { | ||
69 | + // const disabledArr = timeArr(24).splice(hour + 1, timeArr(24).length - hour - 1); | ||
70 | + // console.log('disabledArr1', disabledArr); | ||
71 | + // return disabledArr; | ||
72 | + // }, | ||
73 | + // disabledMinutes: () => { | ||
74 | + // const disabledArr = timeArr(60).splice(minute, timeArr(60).length - minute); | ||
75 | + // console.log('disabledArr2', disabledArr); | ||
76 | + | ||
77 | + // return disabledArr; | ||
78 | + // }, | ||
79 | + // disabledSeconds: () => { | ||
80 | + // const disabledArr = timeArr(60).splice(second, timeArr(60).length - second); | ||
81 | + // console.log('disabledArr3', disabledArr); | ||
82 | + | ||
83 | + // return disabledArr; | ||
84 | + // }, | ||
85 | + // }; | ||
86 | + // } | ||
62 | if (checkYear === nowYear) { | 87 | if (checkYear === nowYear) { |
63 | const nowHour = moment(nowDate).hour(); | 88 | const nowHour = moment(nowDate).hour(); |
64 | const nowMinute = moment(nowDate).minute(); | 89 | const nowMinute = moment(nowDate).minute(); |
@@ -125,6 +150,11 @@ function PlayBackPicker(props:any) { | @@ -125,6 +150,11 @@ function PlayBackPicker(props:any) { | ||
125 | date.current = dateTimestamp; | 150 | date.current = dateTimestamp; |
126 | handelDate(dateTimestamp); | 151 | handelDate(dateTimestamp); |
127 | }} | 152 | }} |
153 | + onOk={ | ||
154 | + (val:any) => { | ||
155 | + console.log('val', val); | ||
156 | + } | ||
157 | + } | ||
128 | /> | 158 | /> |
129 | </div> | 159 | </div> |
130 | ); | 160 | ); |
src/pages/vms/OperationAdministration/components/PlayBackTable/style.css
@@ -2,6 +2,9 @@ | @@ -2,6 +2,9 @@ | ||
2 | width: 100%; | 2 | width: 100%; |
3 | height: 100%; | 3 | height: 100%; |
4 | } | 4 | } |
5 | -.play_back_table .ant-table-cell { | 5 | +.play_back_table .ant-table { |
6 | + min-height: 700px; | ||
7 | +} | ||
8 | +.play_back_table .ant-table .ant-table-cell { | ||
6 | max-width: 100px !important; | 9 | max-width: 100px !important; |
7 | } | 10 | } |
src/pages/vms/OperationAdministration/components/PlayBackTable/style.less
1 | .play_back_table{ | 1 | .play_back_table{ |
2 | width: 100%; | 2 | width: 100%; |
3 | height: 100%; | 3 | height: 100%; |
4 | - .ant-table-cell{ | ||
5 | - max-width: 100px !important; | 4 | + .ant-table{ |
5 | + min-height: 700px; | ||
6 | + .ant-table-cell{ | ||
7 | + max-width: 100px !important; | ||
8 | + } | ||
6 | } | 9 | } |
7 | } | 10 | } |
8 | \ No newline at end of file | 11 | \ No newline at end of file |