add other duty time display with mock

This commit is contained in:
Dawn1Ocean
2024-03-24 20:33:02 +08:00
parent c8dd8061b2
commit 2d148e7aa4
5 changed files with 31 additions and 7 deletions
+8 -1
View File
@@ -12,6 +12,7 @@ export class DutyData {
this.isInDuty = false;
this.inDutyCnt = 3;
this.currentDuty = '2';
this.otherDutyTime = '9:30-11:30';
this.offDutyReason = '学园维修';
this.dutyRecoverTime = '下周一';
this.place = '东三-204';
@@ -20,6 +21,7 @@ export class DutyData {
isInDuty: boolean;
inDutyCnt?: number;
currentDuty?: 'off' | '1' | '2' | '3' | 'others';
otherDutyTime?: string;
offDutyReason?: string;
dutyRecoverTime?: string;
place: string;
@@ -101,7 +103,12 @@ export class DutyInfo extends Component {
<Card isInDuty={data.isInDuty} place={data.place} />
<AtTimeline
items={[
{ title: id.currentDutyText(data.currentDuty || 'off') },
{
title:
data.currentDuty == 'others'
? id.currentDutyText('others') + data.otherDutyTime
: id.currentDutyText(data.currentDuty || 'off'),
},
{ title: id.inDutyCnt(data.inDutyCnt as number) },
]}
/>
+2 -2
View File
@@ -90,7 +90,7 @@ export const mainPageZhCn: MainPageText = {
case '3':
return '第三班 18:00-20:30';
case 'others':
return '其他值班时间,见通知';
return '当班 ';
}
},
inDutyCnt: (n) => '当前值班人数:' + n,
@@ -151,7 +151,7 @@ export const mainPageEnUs: MainPageText = {
case '3':
return '3rd Shift 18:00-20:30';
case 'others':
return 'Other duty time, see notice';
return 'Current Shift ';
}
},
inDutyCnt: (n) => 'EVA members on duty: ' + n,
+1
View File
@@ -27,6 +27,7 @@ export function getDutyInfo(that: MainPage) {
isInDuty: data.isInDuty,
inDutyCnt: data.inDutyCnt,
currentDuty: data.currentDuty,
otherDutyTime: data.otherDutyTime,
place: data.place,
},
});