Dawn_Ocean
/
EVA-Notify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add space in my continuing tickets; dutyinfo data process

mgy
Dawn_Ocean 2024-05-09 17:08:56 +08:00
parent 5cc3387008
commit 590db1f3fd
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/pages/repair/repair.tsx
View File

@ -194,29 +194,30 @@ export default class RepairPage extends Component<{}, RepairPageState> {
{pt.get().repairPage.currentTicket.hint} {pt.get().repairPage.currentTicket.hint}
</View> </View>
{this.state.currentTicketsIdName.map((pair, idx) => ( {this.state.currentTicketsIdName.map((pair, idx) => (
<AtCard <View key={idx} style={{ marginBottom: '20rpx' }}>
key={idx} <AtCard
title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel'] title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
extra={pt.get().repairPage.currentTicket.extra} extra={pt.get().repairPage.currentTicket.extra}
onClick={() => { onClick={() => {
Taro.navigateTo({ Taro.navigateTo({
url: url:
'/pages/TicketDetail/TicketDetail?id=' + '/pages/TicketDetail/TicketDetail?id=' +
pair.keys().next().value, pair.keys().next().value,
}); });
}} }}
note={ note={
pt.get().tips.tipsText[ pt.get().tips.tipsText[
randomInt(0, pt.get().tips.tipsText.length - 1) randomInt(0, pt.get().tips.tipsText.length - 1)
] ]
} }
> >
<DetailFramework <DetailFramework
id={pair.keys().next().value} //pair.keys().next().value == id id={pair.keys().next().value} //pair.keys().next().value == id
isInfoShow={isInfoShow} isInfoShow={isInfoShow}
middleButton={middleButton} middleButton={middleButton}
/> />
</AtCard> </AtCard>
</View>
))} ))}
</View> </View>
) : ( ) : (

6
src/service/dutyInfo.ts
View File

@ -28,14 +28,14 @@ export function getDutyInfo(that: MainPage) {
if (!data.isInDuty) { if (!data.isInDuty) {
that.setState({ that.setState({
dutyData: { dutyData: {
...that.state.dutyData, ...data,
offDutyReason: pt.get().common.offDutyReason, offDutyReason: pt.get().common.offDutyReason,
}, },
}); });
if (data.currentDuty === '0') { if (data.currentDuty === '0') {
that.setState({ that.setState({
dutyData: { dutyData: {
...that.state.dutyData, ...data,
place: pt.get().common.place, place: pt.get().common.place,
offDutyReason: pt.get().common.offDutyReason, offDutyReason: pt.get().common.offDutyReason,
dutyRecoverTime: pt.get().common.dutyRecoverTime, dutyRecoverTime: pt.get().common.dutyRecoverTime,
@ -45,7 +45,7 @@ export function getDutyInfo(that: MainPage) {
} else { } else {
that.setState({ that.setState({
dutyData: { dutyData: {
...that.state.dutyData, ...data,
place: pt.get().common.place, place: pt.get().common.place,
}, },
}); });