Commit 4a218b88 authored by 张宏's avatar 张宏

612

parent e9fe298f
...@@ -12,29 +12,49 @@ class AppRouter extends $AppRouter { ...@@ -12,29 +12,49 @@ class AppRouter extends $AppRouter {
@override @override
List<AutoRoute> get routes => [ List<AutoRoute> get routes => [
// LoginRoute / LoginView(登录页)
AutoRoute(page: LoginRoute.page, initial: true), AutoRoute(page: LoginRoute.page, initial: true),
// DefaultLayoutRoute / DefaultLayoutView(默认布局页/主框架)
AutoRoute( AutoRoute(
page: DefaultLayoutRoute.page, page: DefaultLayoutRoute.page,
children: [ children: [
// HomeRoute / HomeView(首页)
AutoRoute(page: HomeRoute.page, initial: true), AutoRoute(page: HomeRoute.page, initial: true),
// ServiceIndexRoute / ServiceIndexView(服务首页/客房服务看板)
AutoRoute(page: ServiceIndexRoute.page), AutoRoute(page: ServiceIndexRoute.page),
// ReportIndexRoute / ReportIndexView(报表首页)
AutoRoute(page: ReportIndexRoute.page), AutoRoute(page: ReportIndexRoute.page),
// ProfileRoute / ProfileView(我的/个人中心)
AutoRoute(page: ProfileRoute.page), AutoRoute(page: ProfileRoute.page),
], ],
), ),
// SearchRoute / SearchView(搜索页)
AutoRoute(page: SearchRoute.page), AutoRoute(page: SearchRoute.page),
// AbnormalDetailRoute / AbnormalDetailView(异常详情页)
AutoRoute(page: AbnormalDetailRoute.page), AutoRoute(page: AbnormalDetailRoute.page),
AutoRoute(page:DeviceDetailRoute.page), // DeviceDetailRoute / DeviceDetailView(设备详情页)
AutoRoute(page: DeviceDetailRoute.page),
// ServiceRoomDetailRoute / ServiceRoomDetailView(服务-房间详情页)
AutoRoute(page: ServiceRoomDetailRoute.page), AutoRoute(page: ServiceRoomDetailRoute.page),
// ReportEnergyDetailRoute / ReportEnergyDetailView(报表-能耗详情页)
AutoRoute(page: ReportEnergyDetailRoute.page), AutoRoute(page: ReportEnergyDetailRoute.page),
// ReportRoomDetailRoute / ReportRoomDetailView(报表-房间详情页)
AutoRoute(page: ReportRoomDetailRoute.page), AutoRoute(page: ReportRoomDetailRoute.page),
// ServiceDeviceDetailRoute / ServiceDeviceDetailView(服务-设备详情页)
AutoRoute(page: ServiceDeviceDetailRoute.page), AutoRoute(page: ServiceDeviceDetailRoute.page),
// InspectionDetailRoute / InspectionDetailView(巡检详情页)
AutoRoute(page: InspectionDetailRoute.page), AutoRoute(page: InspectionDetailRoute.page),
// InspectionDeviceRoute / InspectionDeviceView(巡检设备页)
AutoRoute(page: InspectionDeviceRoute.page), AutoRoute(page: InspectionDeviceRoute.page),
// InspectionHistoryRoute / InspectionHistoryView(巡检历史页)
AutoRoute(page: InspectionHistoryRoute.page), AutoRoute(page: InspectionHistoryRoute.page),
// AbnormalListRoute / AbnormalListView(异常列表页)
AutoRoute(page: AbnormalListRoute.page), AutoRoute(page: AbnormalListRoute.page),
// ReportRuleManagementRoute / ReportRuleManagementView(报表-联动规则管理页)
AutoRoute(page: ReportRuleManagementRoute.page), AutoRoute(page: ReportRuleManagementRoute.page),
// ReportDeviceListRoute / ReportDeviceListView(报表-设备列表页)
AutoRoute(page: ReportDeviceListRoute.page), AutoRoute(page: ReportDeviceListRoute.page),
// InspectionTopologyRoute / InspectionTopologyView(巡检拓扑页)
AutoRoute(page: InspectionTopologyRoute.page), AutoRoute(page: InspectionTopologyRoute.page),
]; ];
} }
...@@ -39,7 +39,7 @@ class InspectionHistoryCubit extends Cubit<InspectionHistoryState> { ...@@ -39,7 +39,7 @@ class InspectionHistoryCubit extends Cubit<InspectionHistoryState> {
deviceName: result.deviceInfo.deviceName, deviceName: result.deviceInfo.deviceName,
inspectorName: row.inspectorName, inspectorName: row.inspectorName,
inspectionTime: row.inspectTime, inspectionTime: row.inspectTime,
result: row.inspectStatus, result: _getInspectStatusText(row.inspectStatus),
remark: row.remark, remark: row.remark,
items: row.itemsDetail items: row.itemsDetail
.map((item) => InspectionItemRecord( .map((item) => InspectionItemRecord(
...@@ -51,4 +51,19 @@ class InspectionHistoryCubit extends Cubit<InspectionHistoryState> { ...@@ -51,4 +51,19 @@ class InspectionHistoryCubit extends Cubit<InspectionHistoryState> {
); );
}).toList(); }).toList();
} }
String _getInspectStatusText(String status) {
switch (status) {
case '0':
return '巡检中';
case '1':
return '不通过';
case '2':
return '通过';
case '3':
return '警告';
default:
return status;
}
}
} }
\ No newline at end of file
...@@ -158,18 +158,18 @@ class InspectionRecordItem extends StatelessWidget { ...@@ -158,18 +158,18 @@ class InspectionRecordItem extends StatelessWidget {
spacing: 8.w, spacing: 8.w,
runSpacing: 8.h, runSpacing: 8.h,
children: [ children: [
...record.items.map((item) => _buildItemTag(item)).toList(), ...record.items.take(3).map((item) => _buildItemTag(item)),
if (record.items.length > 3) if (record.items.length > 3)
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 6.h), padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 8.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: const Color.fromRGBO(242, 243, 245, 1.0), color: const Color.fromRGBO(242, 245, 249, 1.0),
borderRadius: BorderRadius.circular(16.r), borderRadius: BorderRadius.circular(18.r),
), ),
child: Text( child: Text(
'+${record.items.length - 3}', '+${record.items.length - 3}',
style: TextStyle( style: TextStyle(
fontSize: 20.sp, fontSize: 22.sp,
color: const Color.fromRGBO(100, 116, 139, 1.0), color: const Color.fromRGBO(100, 116, 139, 1.0),
), ),
), ),
...@@ -182,30 +182,28 @@ class InspectionRecordItem extends StatelessWidget { ...@@ -182,30 +182,28 @@ class InspectionRecordItem extends StatelessWidget {
} }
Widget _buildItemTag(InspectionItemRecord item) { Widget _buildItemTag(InspectionItemRecord item) {
final resultColor = _getResultColor(item.result);
return Container( return Container(
padding: EdgeInsets.symmetric(horizontal: 12.w, vertical: 6.h), padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 8.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: _getResultColor(item.result).withOpacity(0.1), color: Color.fromRGBO(209, 250, 229, 1.0), // resultColor.withValues(alpha: 0.18),
borderRadius: BorderRadius.circular(16.r), borderRadius: BorderRadius.circular(18.r),
border: Border.all(
color: _getResultColor(item.result),
width: 1.w,
),
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Icon( Icon(
_getResultIcon(item.result), _getResultIcon(item.result),
color: _getResultColor(item.result), color: resultColor,
size: 16.sp, size: 18.sp,
), ),
SizedBox(width: 4.w), SizedBox(width: 6.w),
Text( Text(
item.name, item.name,
style: TextStyle( style: TextStyle(
fontSize: 20.sp, fontSize: 22.sp,
color: _getResultColor(item.result), color: resultColor,
), ),
), ),
], ],
......
# 智慧酒店 App 接口对接方案 # 智慧酒店 App 接口对接方案
...@@ -1374,7 +1374,7 @@ class xxxBO extends Equatable { ...@@ -1374,7 +1374,7 @@ class xxxBO extends Equatable {
"inspectId": 0, "inspectId": 0,
"inspectorName": "string", "inspectorName": "string",
"inspectTime": "string", "inspectTime": "string",
"inspectStatus": "string", "inspectStatus": "string",// 巡检整体结果状态码:0=巡检中 1=不通过(×红色) 2=通过(✓绿色) 3=警告(⚠黄色)
"remark": "string", "remark": "string",
"itemsDetail": [ // 巡检项明细列表 "itemsDetail": [ // 巡检项明细列表
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment