tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-06 16:29:27 +07:00
parent 887fa4aa71 c7ca83bd57
commit 4b412fa5d2
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx
View File

@@ -187,7 +187,7 @@ export default function ServiceMonitoring() {
useEffect(() => {
(async () => {
await new Promise((resolve) => setTimeout(resolve, 250));
// await new Promise((resolve) => setTimeout(resolve, 250));
const response = await axios.get(`${corporateValue}/service-monitoring/${id}`);
setData(response.data.data);
@@ -400,7 +400,7 @@ export default function ServiceMonitoring() {
<TimelineConnector sx={{border: '0.5px dashed rgba(145, 158, 171, 0.32)', backgrounSize: '4px 4px' }} />
</TimelineSeparator>
<TimelineContent>
<Typography variant='h5' sx={{marginBottom: 2}}> {fDateSuffix(row.date)}</Typography>
<Typography variant='h5' sx={{marginBottom: 2}}> {row.date ? fDateSuffix(row.date) : '-'}</Typography>
<Card sx={{paddinX:2, paddingY:2}} >
<Stack direction={'row'} sx={{ alignItems: 'center', padding: 2, justifyContent: 'space-between' }}>
<Label> {row.time} </Label>
@@ -530,7 +530,7 @@ export default function ServiceMonitoring() {
<TableBody>
<TableRow>
<TableCell>
<Label> {fDateTime(list.datetime)}</Label>
<Label> {list.datetime ? fDateTime(list.datetime) : '-'}</Label>
</TableCell>
<TableCell>{list.examination}</TableCell>
<TableCell>{list.location}</TableCell>