@@ -258,7 +258,7 @@ def get_screen_data(point=None, point_id=None): |
||
| 258 | 258 |
'age': eqpt.get('age', ''),
|
| 259 | 259 |
'temperature': eqpt.get('temperature', ''),
|
| 260 | 260 |
'status': '已上报' if eqpt.get('temperature') else '未上报',
|
| 261 |
- 'last_report_time': time_logs.get(eqpt.macid) if eqpt.get('temperature') else eqpt.get('last_submit_at', ''),
|
|
| 261 |
+ 'last_report_time': time_logs.get(eqpt.get('macid', ''), '') if eqpt.get('temperature') else eqpt.get('last_submit_at', ''),
|
|
| 262 | 262 |
'observed_days': eqpt.get('observed_days', 0),
|
| 263 | 263 |
} for eqpt in eqpts] |
| 264 | 264 |
|
@@ -251,6 +251,7 @@ class ThermometerEquipmentInfo(BaseModelMixin): |
||
| 251 | 251 |
@property |
| 252 | 252 |
def screen_data(self): |
| 253 | 253 |
return {
|
| 254 |
+ 'macid': self.macid, |
|
| 254 | 255 |
'remark': self.remark, |
| 255 | 256 |
'last_submit_at': tc.local_string(utc_dt=self.last_submit_at, format='%m-%d %H:%M'), |
| 256 | 257 |
} |